diff options
Diffstat (limited to 'pkgs')
71 files changed, 1063 insertions, 353 deletions
diff --git a/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch b/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch new file mode 100644 index 000000000000..4c17846b99df --- /dev/null +++ b/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch @@ -0,0 +1,14 @@ +diff -ur clementine-1.2.1-a/CMakeLists.txt clementine-1.2.1-b/CMakeLists.txt +--- clementine-1.2.1-a/CMakeLists.txt 2013-11-25 15:16:24.000000000 -0600 ++++ clementine-1.2.1-b/CMakeLists.txt 2013-12-30 17:01:48.470011058 -0600 +@@ -158,6 +158,10 @@ + include_directories(${TAGLIB_INCLUDE_DIRS}) + include_directories(${QJSON_INCLUDE_DIRS}) + include_directories(${GSTREAMER_INCLUDE_DIRS}) ++include_directories(${GSTREAMER_APP_INCLUDE_DIRS}) ++include_directories(${GSTREAMER_BASE_INCLUDE_DIRS}) ++include_directories(${GSTREAMER_CDDA_INCLUDE_DIRS}) ++include_directories(${GSTREAMER_TAG_INCLUDE_DIRS}) + include_directories(${GLIB_INCLUDE_DIRS}) + include_directories(${GLIBCONFIG_INCLUDE_DIRS}) + include_directories(${LIBXML_INCLUDE_DIRS}) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix new file mode 100644 index 000000000000..cf554f83c8b0 --- /dev/null +++ b/pkgs/applications/audio/clementine/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst_plugins_base +, liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist +, usbmuxd, libmtp, gvfs, libcdio, protobuf, libspotify, qca2, pkgconfig +, sparsehash }: + +stdenv.mkDerivation { + name = "clementine-1.2.1"; + + src = fetchurl { + url = http://clementine-player.googlecode.com/files/clementine-1.2.1.tar.gz; + sha256 = "0kk5cjmb8nirx0im3c0z91af2k72zxi6lwzm6rb57qihya5nwmfv"; + }; + + patches = [ ./clementine-1.2.1-include-paths.patch ]; + + buildInputs = [ + boost + cmake + fftw + gettext + glew + gst_plugins_base + gstreamer + gvfs + libcdio + libgpod + liblastfm + libmtp + libplist + libspotify + pkgconfig + protobuf + qca2 + qjson + qt4 + sparsehash + sqlite + taglib + usbmuxd + ]; + + meta = with stdenv.lib; { + homepage = "http://www.clementine-player.org"; + description = "A multiplatform music player"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 8cb64820295c..255c63a5d6d2 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = http://qmmp.ylsoftware.com/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; repositories.svn = http://qmmp.googlecode.com/svn/; }; } diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 28e610f27f9c..f8e717d60898 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -87,7 +87,17 @@ composableDerivation { // edf { name = "tcl"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter. // edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter. - // edf { name = "lua" ; feat = "luainterp"; enable = { nativeBuildInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};} + // edf { + name = "lua"; + feat = "luainterp"; + enable = { + nativeBuildInputs = [lua]; + configureFlags = [ + "--with-lua-prefix=${args.lua}" + "--enable-luainterp" + ]; + }; + } // edf { name = "cscope"; } #Include cscope interface. // edf { name = "workshop"; } #Include Sun Visual Workshop support. // edf { name = "netbeans"; } #Disable NetBeans integration support. @@ -102,6 +112,7 @@ composableDerivation { ; cfg = { + luaSupport = config.vim.lua or true; pythonSupport = config.vim.python or true; rubySupport = config.vim.ruby or true; nlsSupport = config.vim.nls or false; diff --git a/pkgs/applications/editors/vim/ft-nix-support.patch b/pkgs/applications/editors/vim/ft-nix-support.patch index 4b5a742dac1c..0e73162d33ef 100644 --- a/pkgs/applications/editors/vim/ft-nix-support.patch +++ b/pkgs/applications/editors/vim/ft-nix-support.patch @@ -38,7 +38,8 @@ index 0000000..a2f9918 + finish +endif + -+syn keyword nixKeyword let throw inherit import true false null with ++syn keyword nixKeyword let in rec assert inherit import true false null with ... ++syn keyword nixBuiltin import abort baseNameOf dirOf isNull builtins map removeAttrs throw toString derivation +syn keyword nixConditional if else then +syn keyword nixBrace ( ) { } = +syn keyword nixBuiltin __currentSystem __currentTime __isFunction __getEnv __trace __toPath __pathExists @@ -54,6 +55,7 @@ index 0000000..a2f9918 +syn region nixString start=+"+ skip=+\\"+ end=+"+ contains=nixStringParam + +hi def link nixKeyword Keyword ++hi def link nixBuiltin Function +hi def link nixConditional Conditional +hi def link nixBrace Special +hi def link nixString String diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 234249e85626..d1a084761e79 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -146,10 +146,9 @@ rec { gmic = let imagemagick = pkgs.imagemagickBig; # maybe the non big version is enough? - fftw = pkgs.fftw.override {pthreads = true;}; in pluginDerivation rec { name = "gmic-1.5.7.2"; - buildInputs = [imagemagick pkgconfig fftw gimp] ++ gimp.nativeBuildInputs; + buildInputs = [imagemagick pkgconfig pkgs.fftw gimp] ++ gimp.nativeBuildInputs; src = fetchurl { url = mirror://sourceforge/gmic/gmic_1.5.7.2.tar.gz; sha256 = "1cpbxb3p2c8bcv2cbr150whapzjc7w09i3jza0z9x3xj8c0vdyv1"; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index d34eeba207ce..a1238fe3dcd9 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal -, mpfr, gmp }: +, mpfr, gmp +}: stdenv.mkDerivation rec { version = "2013.06"; diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix index 7ba6e1756ba0..67b733dda7ae 100644 --- a/pkgs/applications/graphics/sane/backends-git.nix +++ b/pkgs/applications/graphics/sane/backends-git.nix @@ -7,12 +7,12 @@ in assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); stdenv.mkDerivation { - name = "sane-backends-1.0.23.296-gf139120"; + name = "sane-backends-1.0.24.73-g6c4f6bc"; src = fetchgit { - url = "http://git.debian.org/git/sane/sane-backends.git"; - rev = "f139120c72db6de98be95b52c206c2a4d8071e92"; - sha256 = "1b2fv19c8ijh9l0jjilli3j70n17wvcgpqq1nxmiby3ai6nrzk8d"; + url = "git://alioth.debian.org/git/sane/sane-backends.git"; + rev = "6c4f6bc58615755dc734281703b594cea3ebf848"; + sha256 = "0f7lbv1rnr53n4rpihcd8dkfm01xvwfnx9i1nqaadrzbpvgkjrfa"; }; udevSupport = hotplugSupport; diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index eaf1c3b725f0..3b5077a14e2a 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -8,12 +8,13 @@ let firmware = gt68xxFirmware { inherit fetchurl; }; in stdenv.mkDerivation rec { - version = "1.0.23"; + version = "1.0.24"; name = "sane-backends-${version}"; src = fetchurl { - url = "https://launchpad.net/ubuntu/+archive/primary/+files/sane-backends_${version}.orig.tar.gz"; - sha256 = "4d4f5b2881615af7fc0ed75fdde7dc623a749e80e40f3f792fe4010163cbb029"; + url = "https://alioth.debian.org/frs/download.php/file/3958/${name}.tar.gz"; + curlOpts = "--insecure"; + sha256 = "0ba68m6bzni54axjk15i51rya7hfsdliwvqyan5msl7iaid0iir7"; }; udevSupport = hotplugSupport; diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 635775e75ac7..f2dadd2e5e8b 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "Simple tool for input event debugging"; license = "GPLv2"; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 3c47e3bf8a82..08d2b29a92a8 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -18,7 +18,8 @@ # gr-video-sdl: PAL and NTSC display , SDL , libusb1, orc, pyopengl -, makeWrapper }: +, makeWrapper +}: stdenv.mkDerivation rec { name = "gnuradio-${version}"; diff --git a/pkgs/applications/misc/pitz/default.nix b/pkgs/applications/misc/pitz/default.nix index 355ea9b2033d..e4f097469a49 100644 --- a/pkgs/applications/misc/pitz/default.nix +++ b/pkgs/applications/misc/pitz/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, buildPythonPackage, tempita, jinja2, pyyaml, clepy, mock -, nose, decorator, docutils }: +, nose, decorator, docutils +}: # TODO: pitz has a pitz-shell utility that depends on ipython, but it just # errors out and dies (it probably depends on an old ipython version): @@ -28,6 +29,6 @@ buildPythonPackage rec { license = licenses.bsd3; homepage = http://pitz.tplus1.com/; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index aa2ceb08e809..203ef7d84a7e 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -2,7 +2,8 @@ # Perl modules: , EncodeLocale, MathClipper, ExtUtilsXSpp, BoostGeometryUtils , MathConvexHullMonotoneChain, MathGeometryVoronoi, MathPlanePath, Moo -, IOStringy, ClassXSAccessor, Wx, GrowlGNTP, NetDBus }: +, IOStringy, ClassXSAccessor, Wx, GrowlGNTP, NetDBus +}: stdenv.mkDerivation rec { version = "0.9.10b"; diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 600bd6bc4394..1079a153ca16 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { homepage = https://code.google.com/p/spyderlib/; license = licenses.mit; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/data/misc/freepats/default.nix b/pkgs/data/misc/freepats/default.nix index 21f34a607d4f..ac015c02b199 100644 --- a/pkgs/data/misc/freepats/default.nix +++ b/pkgs/data/misc/freepats/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://freepats.zenvoid.org/; license = licenses.gpl2; platforms = platforms.all; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index 472930d047bf..1a51f087a28f 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = http://sdcc.sourceforge.net/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 6bdf31bf6c96..5f1749f33c9e 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }: let - version = "0.11.2"; + version = "0.12.0"; in stdenv.mkDerivation { name = "elixir-${version}"; src = fetchurl { url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"; - sha256 = "0rgx33q013c5y2jjwd4l93pzd3v3fha8xdsrhpl9c9wb7yprjc5x"; + sha256 = "0cir2y36zljwphiqyz8xmq7qq0f094jmfy3qwk3wdm05c05nqnc8"; }; buildInputs = [ erlang rebar makeWrapper ]; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 428d97eaf794..66543d305217 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -3,13 +3,13 @@ libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk, fftw, fftwSinglePrec, zlib, curl, qrupdate }: let - version = "3.6.4"; + version = "3.8.0"; in stdenv.mkDerivation rec { name = "octave-${version}"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.bz2"; - sha256 = "0qn9s7jrjmrn6w3rvp8d7vfnymyv0spnxzrp9l7p8p8zb7wms67s"; + sha256 = "1yclb8p4mcx9xcjajyynxfnc5spw90lp44d84v56ksrlvp3314si"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix new file mode 100644 index 000000000000..77a9392ba8bb --- /dev/null +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, cmake, pkgconfig +, jackaudio, libsndfile, fftw, curl +, libXt, qt +}: + +stdenv.mkDerivation rec { + name = "supercollider-3.6.6"; + + meta = { + description = "Programming language for real time audio synthesis"; + homepage = "http://supercollider.sourceforge.net/"; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + }; + + src = fetchurl { + url = "mirror://sourceforge/supercollider/Source/3.6/SuperCollider-3.6.6-Source.tar.bz2"; + sha256 = "11khrv6jchs0vv0lv43am8lp0x1rr3h6l2xj9dmwrxcpdayfbalr"; + }; + + # QGtkStyle unavailable + patchPhase = '' + substituteInPlace editors/sc-ide/widgets/code_editor/autocompleter.cpp \ + --replace Q_WS_X11 Q_GTK_STYLE + ''; + + cmakeFlags = [ + "-DSC_WII=OFF" + "-DSC_EL=OFF" + ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + jackaudio libsndfile fftw curl + libXt qt + ]; +} diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index e096c5fa94f3..97043f11f50f 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -1,30 +1,32 @@ -{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false, pthreads ? false, float ? false}: +{ fetchurl, stdenv, builderDefs, precision ? "double" }: + +assert stdenv.lib.elem precision [ "single" "double" "long-double" "quad-precision" ]; + +with { inherit (stdenv.lib) optional; }; + let - version = "3.3.2"; - localDefs = builderDefs.passthru.function { - src = - fetchurl { - url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz"; - sha256 = "b1236a780ca6e66fc5f8eda6ef0665d680e8253d9f01d7bf211b714a50032d01"; - }; - buildInputs = []; - configureFlags = ["--enable-shared"] - # some distros seem to be shipping both versions within the same package? - # why does --enable-float still result in ..3f.so instead of ..3.so? - ++ (if singlePrecision then [ "--enable-single" ] else [ ]) - ++ (if float then [ "--enable-float" ] else [ ]) - ++ (stdenv.lib.optional (!pthreads) "--enable-openmp") - ++ (stdenv.lib.optional pthreads "--enable-threads") - # I think all i686 has sse - ++ (if (stdenv.isi686 || stdenv.isx86_64) && singlePrecision then [ "--enable-sse" ] else [ ]) - # I think all x86_64 has sse2 - ++ (if stdenv.isx86_64 && ! singlePrecision then [ "--enable-sse2" ] else [ ]); - + version = "3.3.3"; + localDefs = builderDefs.passthru.function { + src = + fetchurl { + url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz"; + sha256 = "1wwp9b2va7vkq3ay7a9jk22nr4x5q6m37rzqy2j8y3d11c5grkc5"; + }; + buildInputs = []; + configureFlags = [ + "--enable-shared" "--disable-static" + "--enable-threads" "--enable-openmp" # very small wrappers + ] + ++ optional (precision != "double") "--enable-${precision}" + # all x86_64 have sse2 + ++ optional stdenv.isx86_64 "--enable-sse2"; }; + in with localDefs; -stdenv.mkDerivation { - name = "fftw-3.3.2" + ( if singlePrecision then "-single" else "-double" ); - builder = writeScript "fftw-3.3.2-builder" + +stdenv.mkDerivation rec { + name = "fftw-${precision}-${version}"; + builder = writeScript "${name}-builder" (textClosure localDefs [doConfigure doMakeInstall doForceShare]); meta = { description = "Fastest Fourier Transform in the West library"; @@ -34,3 +36,4 @@ stdenv.mkDerivation { inherit src; }; } + diff --git a/pkgs/development/libraries/glibc/2.18/common.nix b/pkgs/development/libraries/glibc/2.18/common.nix index 6692bd90ff90..9271e33cf07b 100644 --- a/pkgs/development/libraries/glibc/2.18/common.nix +++ b/pkgs/development/libraries/glibc/2.18/common.nix @@ -61,7 +61,9 @@ stdenv.mkDerivation ({ ./cve-2013-4332.patch ./cve-2013-4458.patch ./cve-2013-4788.patch - ]; + ] + # the problem only seems to affect i686, so avoid re-hash x86_64 ATM + ++ stdenv.lib.optional stdenv.isi686 ./strstr-sse42-hack.patch; postPatch = '' # Needed for glibc to build with the gnumake 3.82 diff --git a/pkgs/development/libraries/glibc/2.18/strstr-sse42-hack.patch b/pkgs/development/libraries/glibc/2.18/strstr-sse42-hack.patch new file mode 100644 index 000000000000..cdf4c0253167 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.18/strstr-sse42-hack.patch @@ -0,0 +1,14 @@ +https://bugs.archlinux.org/task/36556 +diff --git a/sysdeps/x86_64/multiarch/strstr.c b/sysdeps/x86_64/multiarch/strstr.c +index cd63b68..03d8b9a 100644 +--- a/sysdeps/x86_64/multiarch/strstr.c ++++ b/sysdeps/x86_64/multiarch/strstr.c +@@ -86,7 +86,7 @@ + /* Simple replacement of movdqu to address 4KB boundary cross issue. + If EOS occurs within less than 16B before 4KB boundary, we don't + cross to next page. */ +-static __m128i ++static inline __m128i + __m128i_strloadu (const unsigned char * p, __m128i zero) + { + if (__builtin_expect ((int) ((size_t) p & 0xfff) > 0xff0, 0)) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 0db3722e6aaa..1f1ab5d72823 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -32,7 +32,7 @@ let cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; - patches = [ ./datadir_env.patch ]; + patches = [ ./datadir_env.patch ./poppler-glib.patch ]; # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files # such as `../../../test/unittestcases/UseNone.pdf'. diff --git a/pkgs/development/libraries/poppler/poppler-glib.patch b/pkgs/development/libraries/poppler/poppler-glib.patch new file mode 100644 index 000000000000..09f5a145b847 --- /dev/null +++ b/pkgs/development/libraries/poppler/poppler-glib.patch @@ -0,0 +1,19 @@ +diff -rupN a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake +--- a/poppler-glib.pc.cmake 2013-08-17 01:20:41.000000001 +0200 ++++ b/poppler-glib.pc.cmake 2014-01-01 09:30:50.000000001 +0100 +@@ -10,4 +10,4 @@ Requires: glib-2.0 >= @GLIB_REQUIRED@ go + @PC_REQUIRES_PRIVATE@ + + Libs: -L${libdir} -lpoppler-glib +-Cflags: -I${includedir}/poppler/glib ++Cflags: -I${includedir}/poppler/glib -I${includedir}/poppler +diff -rupN a/poppler-glib.pc.in b/poppler-glib.pc.in +--- a/poppler-glib.pc.in 2013-08-17 01:20:41.000000001 +0200 ++++ b/poppler-glib.pc.in 2014-01-01 09:27:17.000000001 +0100 +@@ -10,4 +10,5 @@ Requires: glib-2.0 >= @GLIB_REQUIRED@ go + @PC_REQUIRES_PRIVATE@ + + Libs: -L${libdir} -lpoppler-glib +-Cflags: -I${includedir}/poppler/glib ++Cflags: -I${includedir}/poppler/glib -I${includedir}/poppler ++ diff --git a/pkgs/development/libraries/sparsehash/default.nix b/pkgs/development/libraries/sparsehash/default.nix new file mode 100644 index 000000000000..1f9bbcbd18da --- /dev/null +++ b/pkgs/development/libraries/sparsehash/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "sparsehash-2.0.2"; + + src = fetchurl { + url = http://sparsehash.googlecode.com/files/sparsehash-2.0.2.tar.gz; + sha256 = "0z5qa1sbp6xx5qpdvrdjh185k5kj53sgb6h2qabw01sn2nkkkmif"; + }; + + meta = with stdenv.lib; { + homepage = "http://code.google.com/p/sparsehash/"; + description = "An extremely memory-efficient hash_map implementation"; + platforms = platforms.all; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 85e5726f8636..eb55d1d60f41 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { # The library is LGPLv3, the wildmidi executable is GPLv3 license = licenses.lgpl3; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index ed9890150a37..b5c0b0a03dae 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = http://martine.github.io/ninja/; license = licenses.asl20; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index e0da284887cc..c625f1474006 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libftdi, libusb1 }: +{ stdenv, fetchurl, libftdi, libusb1 }: stdenv.mkDerivation rec { name = "openocd-${version}"; diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix index 8dce23aa9593..770c80710953 100644 --- a/pkgs/development/tools/misc/premake/default.nix +++ b/pkgs/development/tools/misc/premake/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip }: let baseName = "premake"; version = "4.3"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1017rd0wsjfyq2jvpjjhpszaa7kmig6q1nimw76qx3cjz2868lrn"; }; - buildInputs = [unzip]; + buildInputs = [ unzip ]; buildPhase = '' make -C build/gmake.unix/ @@ -27,6 +27,6 @@ stdenv.mkDerivation { description = "A simple build configuration and project generation tool using lua"; license = stdenv.lib.licenses.bsd3; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index c4dfa99becdc..13796453eba2 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { description = "In-circuit debug and programming for ST-Link devices"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix index 43ff8df70d27..645bd0611777 100644 --- a/pkgs/development/tools/misc/tcptrack/default.nix +++ b/pkgs/development/tools/misc/tcptrack/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = http://www.rhythm.cx/~steve/devel/tcptrack/; # dead link license = licenses.lgpl21; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix new file mode 100644 index 000000000000..e40dec3c23fc --- /dev/null +++ b/pkgs/games/nexuiz/default.nix @@ -0,0 +1,76 @@ +{ stdenv, fetchurl +, # required for both + unzip, zlib, curl, libjpeg, libpng, libvorbis, libtheora +, libogg, libmodplug +, # glx + libX11, mesa, libXpm, libXext, libXxf86vm, libXxf86dga, alsaLib +, # sdl + SDL +}: + +let + version = "2.5.2"; + + version_short = stdenv.lib.replaceChars [ "." ] [ "" ] "${version}"; +in stdenv.mkDerivation { + name = "nexuiz-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/nexuiz/nexuiz-${version_short}.zip"; + sha256 = "0010jrxc68qqinkvdh1qn2b8z3sa5v1kcd8d1m4llp3pr6y7xqm5"; + }; + + buildInputs = [ + # required for both + unzip + # glx + libX11 mesa libXpm libXext libXxf86vm libXxf86dga alsaLib + # sdl + SDL + ]; + + postUnpack = '' + cd Nexuiz/sources/ + unzip enginesource*.zip + cd ../../ + ''; + + NIX_LDFLAGS = '' + -rpath ${zlib}/lib + -rpath ${curl}/lib + -rpath ${libjpeg}/lib + -rpath ${libpng}/lib + -rpath ${libvorbis}/lib + -rpath ${libtheora}/lib + -rpath ${libogg}/lib + -rpath ${libmodplug}/lib + ''; + + buildPhase = '' + cd sources/darkplaces/ + DP_FS_BASEDIR="$out/share/nexuiz" + make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-release + make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-release + make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-release + cd ../../ + ''; + + installPhase = '' + mkdir -pv "$out/bin/" + cp -v sources/darkplaces/darkplaces-glx "$out/bin/nexuiz-glx" + cp -v sources/darkplaces/darkplaces-sdl "$out/bin/nexuiz-sdl" + cp -v sources/darkplaces/darkplaces-dedicated "$out/bin/nexuiz-dedicated" + mkdir -pv "$out/share/nexuiz/" + cp -rv data/ "$out/share/nexuiz/" + ln -s "$out/bin/nexuiz-sdl" "$out/bin/nexuiz" + ''; + + dontPatchELF = true; + + meta = { + description = "A free fast-paced first-person shooter"; + homepage = "http://www.alientrap.org/games/nexuiz"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 137429cdc838..9db82d722d27 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -1,4 +1,11 @@ -{ stdenv, fetchurl, unzip, SDL, libjpeg, zlib, libvorbis, curl }: +{ stdenv, fetchurl +, # required for both + unzip, libjpeg, zlib, libvorbis, curl +, # glx + libX11, mesa, libXpm, libXext, libXxf86vm, alsaLib +, # sdl + SDL +}: stdenv.mkDerivation rec { name = "xonotic-0.7.0"; @@ -8,9 +15,14 @@ stdenv.mkDerivation rec { sha256 = "21a5fb5493c269cd3843789cb8598f952d4196e8bc71804b9bd5808b646542c6"; }; - # Commented out things needed to build cl-release because of errors. - #buildInputs = [ libX11 libXpm libXext xf86dgaproto libXxf86dga libXxf86vm mesa ]; - buildInputs = [ unzip SDL libjpeg ]; + buildInputs = [ + # required for both + unzip libjpeg + # glx + libX11 mesa libXpm libXext libXxf86vm alsaLib + # sdl + SDL + ]; sourceRoot = "Xonotic/source/darkplaces"; @@ -27,7 +39,7 @@ stdenv.mkDerivation rec { buildPhase = '' DP_FS_BASEDIR="$out/share/xonotic" - #make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-release + make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-release make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-release make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-release ''; @@ -36,9 +48,13 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" cp darkplaces-dedicated "$out/bin/xonotic-dedicated" cp darkplaces-sdl "$out/bin/xonotic-sdl" + cp darkplaces-glx "$out/bin/xonotic-glx" cd ../.. mkdir -p "$out/share/xonotic" mv data "$out/share/xonotic" + + # default to sdl + ln -s "$out/bin/xonotic-sdl" "$out/bin/xonotic" ''; dontPatchELF = true; diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index d6c0c70026d7..f19ef0fcc7f3 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; let - version = "1.7.9"; + version = "1.7.10"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "0nlw4x1zww529nm1vd0n7ysjlrbppd9ljk27ki1iasb94k69xybr"; + sha256 = "1nybsp4pga0jhx6rm6ngpa2ixsbj75p8w22r9d70x4zgjx5hw9s4"; }; gecko = fetchurl { diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index e3fe48ec8a3c..f47902cd0bf1 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -2,13 +2,13 @@ , cabextract, unzip, p7zip, gnused, gnugrep, bash } : stdenv.mkDerivation rec { - rev = "1078"; + rev = "1083"; name = "winetricks-${rev}"; src = fetchsvn { url = "http://winetricks.googlecode.com/svn/trunk"; inherit rev; - sha256 = "0ipvld0r5h6x2pgqkqa82q0w9flx6fn9aha8fd7axf5ji2gzmidm"; + sha256 = "0zakwn7g2ni6xw92i1y3pngyaxsr93714s4jy11adf7rxdkj0a32"; }; buildInputs = [ perl which ]; diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index 0b34fc0f9fec..eaab4276c1a3 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -9,9 +9,11 @@ stdenv.mkDerivation { }; buildInputs = [ nasm SDL zlib libpng ncurses mesa ]; - + preConfigure = '' cd src + + sed -i "/^STRIP/d" configure # Fix for undefined strncasecmp() echo '#include <strings.h>' > tmp.cpp @@ -35,4 +37,4 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.sander ]; homepage = http://www.zsnes.com; }; -} \ No newline at end of file +} diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix new file mode 100644 index 000000000000..017a47349a9c --- /dev/null +++ b/pkgs/misc/themes/qtcurve/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, cmake, gettext, gtk2, kde_workspace, kdelibs, libpthreadstubs, libXdmcp +, libxcb, pkgconfig, xlibs }: + +stdenv.mkDerivation { + name = "qtcurve-1.8.17"; + src = fetchurl { + url = "https://github.com/QtCurve/qtcurve/archive/1.8.17.tar.gz"; + sha256 = "1ixgill9lfhmcfsk5csk6ww3ljzbvb4x48m73apprv949xgr4wyn"; + }; + + buildInputs = [ + cmake + gettext + gtk2 + kde_workspace + kdelibs + libpthreadstubs + libXdmcp + libxcb + pkgconfig + xlibs.xcbutilimage + ]; + + patches = [ ./qtcurve-1.8.17-install-paths.patch ]; + + cmakeFlags = '' + -DENABLE_QT5=OFF + -DQTC_QT4_ENABLE_KWIN=ON + ''; + + meta = { + homepage = https://github.com/QtCurve/qtcurve; + description = "Widget styles for Qt4/KDE4 and gtk2"; + platforms = stdenv.lib.platforms.linux; + license = "LGPLv2.1+"; + }; +} diff --git a/pkgs/misc/themes/qtcurve/qtcurve-1.8.17-install-paths.patch b/pkgs/misc/themes/qtcurve/qtcurve-1.8.17-install-paths.patch new file mode 100644 index 000000000000..bb8fd185c77a --- /dev/null +++ b/pkgs/misc/themes/qtcurve/qtcurve-1.8.17-install-paths.patch @@ -0,0 +1,25 @@ +diff -ur qtcurve-1.8.17-a/CMakeLists.txt qtcurve-1.8.17-b/CMakeLists.txt +--- qtcurve-1.8.17-a/CMakeLists.txt 2013-10-18 07:35:20.000000000 -0500 ++++ qtcurve-1.8.17-b/CMakeLists.txt 2013-12-30 10:58:43.303808246 -0600 +@@ -135,8 +135,9 @@ + if(ENABLE_GTK2) + find_package(PkgConfig REQUIRED) + pkg_check_modules(GTK2 REQUIRED gtk+-2.0) ++ set(GTK2_THEME_PREFIX "${CMAKE_INSTALL_PREFIX}") + if(GTK2_THEME_PREFIX) +- set(GTK2_PREIX "${GTK2_THEME_PREFIX}") ++ set(GTK2_PREFIX "${GTK2_THEME_PREFIX}") + elseif(NOT GTK2_PREFIX) + set(GTK2_PREFIX "${CMAKE_INSTALL_PREFIX}") + endif() +diff -ur qtcurve-1.8.17-a/gtk2/style/CMakeLists.txt qtcurve-1.8.17-b/gtk2/style/CMakeLists.txt +--- qtcurve-1.8.17-a/gtk2/style/CMakeLists.txt 2013-10-18 07:35:20.000000000 -0500 ++++ qtcurve-1.8.17-b/gtk2/style/CMakeLists.txt 2013-12-30 11:23:41.370548328 -0600 +@@ -88,6 +88,6 @@ + m ${QTC_X11_LIBRARIES} qtcurve-utils) + + install(TARGETS qtcurve-gtk2 LIBRARY DESTINATION +- ${GTK2_LIBDIR}/gtk-2.0/${GTK2_BIN_VERSION}/engines) ++ lib/gtk-2.0/${GTK2_BIN_VERSION}/engines) + install(FILES gtkrc icons3 icons4 map_kde_icons.pl kdeglobals + DESTINATION ${GTK2_THEME_DIR}/gtk-2.0) diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 1aea10141d53..8f5ecb712059 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-13-4-linux-x86.x86_64.zip; sha256 = "1914ikdich0kg047bqh89ai5z4dyryj5mlw5i46n90fsfiaxa532"; + curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; }; patchPhase = "patch -p0 < ${./gentoo-patches.patch}"; diff --git a/pkgs/os-specific/linux/ifenslave/default.nix b/pkgs/os-specific/linux/ifenslave/default.nix new file mode 100644 index 000000000000..d8985003b41a --- /dev/null +++ b/pkgs/os-specific/linux/ifenslave/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "ifenslave-${version}"; + version = "1.1.0"; + + src = fetchurl { + url = "mirror://debian/pool/main/i/ifenslave-2.6/ifenslave-2.6_${version}.orig.tar.gz"; + sha256 = "0h9hrmy19zdksl7ys250r158b943ihbgkb95n8p4k8l0vqsby5vr"; + }; + + buildPhase = '' + gcc -o ifenslave ifenslave.c + ''; + + installPhase = '' + mkdir -p $out/bin + cp -a ifenslave $out/bin + ''; + + meta = { + description = "Utility for enslaving networking interfaces under a bond"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 4f16ab35527b..6c8f1fd7a9f0 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, makeWrapper, which, coreutils, rrdtool, perl, perlPackages -, python, ruby, openjdk, nettools }: +, python, ruby, openjdk, nettools +}: stdenv.mkDerivation rec { version = "2.0.17"; diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix deleted file mode 100644 index b7f2d7d2a502..000000000000 --- a/pkgs/servers/sql/postgresql/8.3.x.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, zlib, ncurses, readline }: - -let version = "8.3.23"; in - -stdenv.mkDerivation rec { - name = "postgresql-${version}"; - - src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1n8qj1bvyx83jsn2x2l8xzk53c014gkz8hwvswvnzcdyvlbnd90p"; - }; - - buildInputs = [ zlib ncurses readline ]; - - LC_ALL = "en_US"; - - passthru = { inherit readline; }; - - meta = { - homepage = http://www.postgresql.org/; - description = "A powerful, open source object-relational database system"; - license = "bsd"; - }; -} diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index a99d7536a8a2..b027d0093e88 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.4.18"; in +let version = "8.4.19"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "c08e5e93dac9d484019a07ff91db9f224350b90ef4be1543e33282cc20daf872"; + sha256 = "f744d04a5d9feeea516fa57fea92be5568527bab03a84cf660a06ce90f90dcea"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index 3810eeba72c5..40878fc6e783 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.0.14"; in +let version = "9.0.15"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "de42b669cb891fc9b925406e71d1669ed5c856aae6d552ac6f14bf6dec0b79f1"; + sha256 = "a45acd27d546e425911ecd371247066be5dafd96304e50e0708c84b918c28f9d"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 65a969b4db0e..9eefe708798f 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.1.10"; in +let version = "9.1.11"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "8329bcd160fcb76ee8c79676f6c979a94069ca5c108449fbb365e1ea98f92b77"; + sha256 = "ccbc35aae1490ee5878b97a6aea48dad7465cdad296b380542e4303b68cc6f74"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index eb6a2714eb2c..8f78dffb4ba3 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.2.5"; in +let version = "9.2.6"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "22c1edfd6a404bb15fba655863e94f09a10716ded1910a8bc98ee85f413007a4"; + sha256 = "4ba98053a66e5678af93dbc2956e8b04623f759e174f48940c41f4251cf0f886"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index a2035873710b..b2dedf4688d3 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -52,12 +52,12 @@ stdenv.mkDerivation rec { tar xf ${xorgserver.src} cp -R xorg*/* unix/xserver pushd unix/xserver - for a in $xorgPatches + for a in $xorgPatches ../xserver114.patch do patch -p1 < $a done autoreconf -vfi - ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx --prefix="$out" + ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx --prefix="$out" --disable-unit-tests make TIGERVNC_SRCDIR=`pwd`/../.. popd ''; diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 3159bae1826f..ccfea341771f 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaq"; - version="642"; + version="643"; name="${baseName}-${version}"; - hash="020nd5gzzynhccldbf1kh4x1cc3445b7ig2cl30xvxaz16h1r2p5"; - url="http://mattmahoney.net/dc/zpaq642.zip"; - sha256="020nd5gzzynhccldbf1kh4x1cc3445b7ig2cl30xvxaz16h1r2p5"; + hash="1sgrhvvzrjb9gm9lffs1ai602v8p1mav0kc2sa7wlcx7kj1d3hxr"; + url="http://mattmahoney.net/dc/zpaq643.zip"; + sha256="1sgrhvvzrjb9gm9lffs1ai602v8p1mav0kc2sa7wlcx7kj1d3hxr"; }; buildInputs = [ unzip diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix index 2ef4aa4ff1ff..e51d6d6acea1 100644 --- a/pkgs/tools/backup/chunksync/default.nix +++ b/pkgs/tools/backup/chunksync/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [openssl perl]; + NIX_LDFLAGS = "-lgcc_s"; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 5e95ede695cd..b184dff11cd2 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, coreutils, python, duplicity, gawk, gnupg1, bash -, gnugrep, txt2man, makeWrapper }: +, gnugrep, txt2man, makeWrapper +}: stdenv.mkDerivation { name = "duply-1.5.11"; diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 5593075c1d7c..16c5b58c38da 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,10 +1,12 @@ { stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo }: +let version = "3.12"; in + stdenv.mkDerivation rec { - name = "btrfs-progs-${meta.version}"; + name = "btrfs-progs-${version}"; src = fetchurl { - url = "mirror://kernel/linux/kernel/people/mason/btrfs-progs/btrfs-progs-v${meta.version}.tar.xz"; + url = "mirror://kernel/linux/kernel/people/mason/btrfs-progs/btrfs-progs-v${version}.tar.xz"; sha256 = "1pwcjf9jqdiy8445r1xkazqa07xmapnn0ylyz7yzphci3ib66zh9"; }; @@ -20,6 +22,5 @@ stdenv.mkDerivation rec { homepage = https://btrfs.wiki.kernel.org/; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; - version="3.12"; }; } diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix new file mode 100644 index 000000000000..c51837eef181 --- /dev/null +++ b/pkgs/tools/filesystems/chunkfs/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, perl, fuse }: + +stdenv.mkDerivation rec { + version = "0.7"; + name = "chunkfs-${version}"; + + src = fetchurl { + url = "http://chunkfs.florz.de/chunkfs_${version}.tar.gz"; + sha256 = "4c168fc2b265a6ba34afc565707ea738f34375325763c0596f2cfa1c9b8d40f1"; + }; + + buildInputs = [perl fuse]; + + makeFlags = [ + "DESTDIR=$(out)" + "PREFIX=" + ]; + + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + ''; + + meta = { + description = "(Un)ChunkFS is a pair of FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa."; + homepage = "http://chunkfs.florz.de/"; + license = "GPLv2"; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 7b5f16c502d1..2abc84e78e41 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.7.69"; + name = "pngcrush-1.7.70"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "0j9nis6513hxd6klcv5559rwnfg7kawp2vqd4qgc1ax6wyvga4mw"; + sha256 = "04zgnqdfq7mcsgml719wb552v8cfg52d8knbhqv55kwgw7y822jh"; }; configurePhase = '' diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix new file mode 100644 index 000000000000..9cefa11ce69f --- /dev/null +++ b/pkgs/tools/misc/dvtm/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + name = "dvtm-0.10"; + + meta = { + description = "Dynamic virtual terminal manager"; + homepage = "http://www.brain-dump.org/projects/dvtm"; + license = stdenv.lib.licenses.mit; + platfroms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "${meta.homepage}/${name}.tar.gz"; + sha256 = "0lb6p06jfaz1z07k0v2gipzx67swf7rijz17g5ndhng2g0jqfl3p"; + }; + + buildInputs = [ ncurses ]; + + prePatch = '' + substituteInPlace Makefile \ + --replace /usr/share/terminfo $out/share/terminfo + ''; + + installPhase = '' + make PREFIX=$out install + ''; +} diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 01b45cd6d8b7..48baa8bff018 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "ethtool-3.11"; diff --git a/pkgs/tools/misc/kde-gtk-config/default.nix b/pkgs/tools/misc/kde-gtk-config/default.nix new file mode 100644 index 000000000000..e9f0af2815a9 --- /dev/null +++ b/pkgs/tools/misc/kde-gtk-config/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, cmake, gettext, gtk2, gtk3, kdelibs +, libxcb, libpthreadstubs, libXdmcp, pkgconfig, glib, gdk_pixbuf }: + +stdenv.mkDerivation { + name = "kde-gtk-config-2.2.1"; + src = fetchurl { + url = "mirror://kde/stable/kde-gtk-config/2.2.1/src/kde-gtk-config-2.2.1.tar.xz"; + sha256 = "11aw86jcjcg3ywnzrxy9x8dvd73my18k0if52fnvyvmb75z0v2cw"; + }; + + buildInputs = [ + cmake + gdk_pixbuf + gettext + glib + gtk2 + gtk3 + kdelibs + libxcb + libpthreadstubs + libXdmcp + pkgconfig + ]; + + patches = [ ./kde-gtk-config-2.2.1-install-paths.patch ]; + + cmakeFlags = '' + -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include + -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include + -DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0 + -DKDE4_LIBEXEC_INSTALL_DIR=lib/kde4/libexec + ''; + + meta = { + homepage = https://projects.kde.org/projects/extragear/base/kde-gtk-config; + description = "GTK configuration module for KDE System Settings"; + longDescription = '' + Configuration dialog to adapt GTK applications appearance to your taste under KDE. + Among its many features, it lets you: + - Choose which theme is used for GTK2 and GTK3 applications. + - Tweak some GTK applications behaviour. + - Select what icon theme to use in GTK applications. + - Select GTK applications default fonts. + - Easily browse and install new GTK2 and GTK3 themes. + ''; + platforms = stdenv.lib.platforms.linux; + license = "GPLv3"; + }; +} diff --git a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-2.2.1-install-paths.patch b/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-2.2.1-install-paths.patch new file mode 100644 index 000000000000..e6596ef0dcc7 --- /dev/null +++ b/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-2.2.1-install-paths.patch @@ -0,0 +1,28 @@ +diff -ur kde-gtk-config-2.2.1-a/gtk3proxies/CMakeLists.txt kde-gtk-config-2.2.1-b/gtk3proxies/CMakeLists.txt +--- kde-gtk-config-2.2.1-a/gtk3proxies/CMakeLists.txt 2013-03-18 06:02:39.000000000 -0500 ++++ kde-gtk-config-2.2.1-b/gtk3proxies/CMakeLists.txt 2013-12-24 18:57:59.854264894 -0600 +@@ -6,4 +6,4 @@ + + add_executable(gtk3_preview preview3.c) + target_link_libraries(gtk3_preview ${GTK3_LIBRARY} ${GOBJECT2_LIBRARY} ${GLIB2_LIBRARY}) +-install(TARGETS gtk3_preview RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}") ++install(TARGETS gtk3_preview RUNTIME DESTINATION bin) +diff -ur kde-gtk-config-2.2.1-a/gtkproxies/CMakeLists.txt kde-gtk-config-2.2.1-b/gtkproxies/CMakeLists.txt +--- kde-gtk-config-2.2.1-a/gtkproxies/CMakeLists.txt 2013-03-18 06:02:39.000000000 -0500 ++++ kde-gtk-config-2.2.1-b/gtkproxies/CMakeLists.txt 2013-12-24 18:57:40.967781611 -0600 +@@ -4,13 +4,13 @@ + + add_executable(reload_gtk_apps reload.c) + target_link_libraries(reload_gtk_apps ${GTK2_LIBRARIES}) +-install(TARGETS reload_gtk_apps RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}") ++install(TARGETS reload_gtk_apps RUNTIME DESTINATION bin) + + add_definitions("-DDATA_DIR=\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"") + + add_executable(gtk_preview preview.c) + target_link_libraries(gtk_preview ${GTK2_LIBRARIES} ${GTK2_GIOMM_LIBRARY}) +-install(TARGETS gtk_preview RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}") ++install(TARGETS gtk_preview RUNTIME DESTINATION bin) + + # preview file used for the gtk3 version too + install(FILES preview.ui diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index eb6baf41fe47..40e6f3322cd9 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2013.12.20"; + version = "2014.01.03"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0cqr0rpa247gfk5fg65sj94x4d9a1s85343gnqmc763h5h8v50zb"; + sha256 = "01zg3a0jx89vikwxnhchjydamb2k724mxnpzs5hbavgfyklkb7xd"; }; buildInputs = [ python ]; diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix index 515ea5edf88c..2dcfd09bb777 100644 --- a/pkgs/tools/networking/ncftp/default.nix +++ b/pkgs/tools/networking/ncftp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, coreutils}: +{ stdenv, fetchurl, ncurses, coreutils }: let version = "3.2.5"; in stdenv.mkDerivation { diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 4f72c0e294f2..0c2d02a5e775 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "130rdin3wh9vlwhscbgh3lsssi89p5n4maws4y3l9ja720llk27n"; + sha256 = "1sx97cp9nb5p82kg2dl6dmqri7wichpjqchhx7bk77limngby7jq"; }; buildInputs = [ @@ -33,9 +33,6 @@ stdenv.mkDerivation rec { ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ]; - preFixup = '' - rm $out/share/glib-2.0/schemas/gschemas.compiled''; - postInstall = '' mkdir -p $out/etc/NetworkManager/VPN ln -s ${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name $out/etc/NetworkManager/VPN/nm-openvpn-service.name @@ -62,5 +59,9 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ phreedom urkud rickynils ]; platforms = platforms.linux; + + # resolve collision between evince and nm-applet for + # gschemas.compiled + priority = 6; }; } diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 25494d75f0dc..217397600946 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz , udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables -, libgcrypt, dnsmasq, avahi, bind, perl, substituteAll }: +, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll }: stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "0.9.8.4"; + version = "0.9.8.8"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz"; - sha256 = "168dv290mc19szgv1l108i8gyha47wmyr41jlzwqvvibynmg17sc"; + sha256 = "0mbsl6x3aavdnam8i87p0zz8fvvgi96g199s35wgg5r8rplks2la"; }; preConfigure = '' @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "--with-kernel-firmware-dir=/run/current-system/firmware" "--with-session-tracking=systemd" ]; - buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz ]; + buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz bluez5 ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { homepage = http://projects.gnome.org/NetworkManager/; description = "Network configuration and management tool"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ phreedom urkud rickynils ]; + maintainers = with maintainers; [ phreedom urkud rickynils iElectric ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index fc9a964004e5..94224fc63bd6 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-openconnect"; - version = networkmanager.version; + version = "0.9.8.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index b72312a1af2d..821e72d49085 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-openvpn"; - version = networkmanager.version; + version = "0.9.8.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index dc2c800e7971..d0a92b78309d 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-pptp"; - version = networkmanager.version; + version = "0.9.8.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; - sha256 = "7f46ea61376d13d03685eca3f26a26e0022f6e92e6f1fc356034ca9717eb6daa"; + sha256 = "1s6wmznd6azvg028x8y3syniqy9j7nmx5j71w2wc6mk0f9pqzflp"; }; buildInputs = [ networkmanager pptp ppp ] diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix new file mode 100644 index 000000000000..361d44eaca75 --- /dev/null +++ b/pkgs/tools/networking/ngrep/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, libpcap }: + +stdenv.mkDerivation rec { + name = "ngrep-1.45"; + + src = fetchurl { + url = "mirror://sourceforge/ngrep/${name}.tar.bz2"; + sha256 = "19rg8339z5wscw877mz0422wbsadds3mnfsvqx3ihy58glrxv9mf"; + }; + + buildInputs = [ libpcap ]; + + preConfigure = '' + # Fix broken test for BPF header file + sed -i "s|BPF=.*|BPF=${libpcap}/include/pcap/bpf.h|" configure + + configureFlags="$configureFlags --with-pcap-includes=${libpcap}/include" + ''; + + meta = with stdenv.lib; { + description = "Network packet analyzer"; + longDescription = '' + ngrep strives to provide most of GNU grep's common features, applying + them to the network layer. ngrep is a pcap-aware tool that will allow you + to specify extended regular or hexadecimal expressions to match against + data payloads of packets. It currently recognizes IPv4/6, TCP, UDP, + ICMPv4/6, IGMP and Raw across Ethernet, PPP, SLIP, FDDI, Token Ring and + null interfaces, and understands BPF filter logic in the same fashion as + more common packet sniffing tools, such as tcpdump and snoop. + ''; + homepage = http://ngrep.sourceforge.net/; + # <ngrep>/doc/README.txt says that ngrep itself is licensed under a + # 'BSD-like' license but that the 'regex' library (in the ngrep tarball) is + # GPLv2. + license = "BSD-like"; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 78d44b7768dc..3c33da1b6619 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, libpcap, gnutls, libgcrypt, libxml2, glib, geoip, sqlite -, which }: +, which +}: # ntopng includes LuaJIT, mongoose, rrdtool and zeromq in its third-party/ # directory. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56f812136dc6..6846af91de6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -660,12 +660,16 @@ let chrony = callPackage ../tools/networking/chrony { }; + chunkfs = callPackage ../tools/filesystems/chunkfs { }; + chunksync = callPackage ../tools/backup/chunksync { }; cjdns = callPackage ../tools/networking/cjdns { }; cksfv = callPackage ../tools/networking/cksfv { }; + clementine = callPackage ../applications/audio/clementine { }; + ciopfs = callPackage ../tools/filesystems/ciopfs { }; colord = callPackage ../tools/misc/colord { }; @@ -825,6 +829,8 @@ let dvgrab = callPackage ../tools/video/dvgrab { }; + dvtm = callPackage ../tools/misc/dvtm { }; + e2fsprogs = callPackage ../tools/filesystems/e2fsprogs { }; easyrsa = callPackage ../tools/networking/easyrsa { }; @@ -1437,6 +1443,8 @@ let newsbeuter-dev = callPackage ../applications/networking/feedreaders/newsbeuter/dev.nix { }; + ngrep = callPackage ../tools/networking/ngrep { }; + ngrok = callPackage ../tools/misc/ngrok { }; mpack = callPackage ../tools/networking/mpack { }; @@ -1828,6 +1836,8 @@ let inherit (pkgsi686Linux.xlibs) libX11; }; + sparsehash = callPackage ../development/libraries/sparsehash { }; + stardict = callPackage ../applications/misc/stardict/stardict.nix { inherit (gnome) libgnomeui scrollkeeper; }; @@ -2848,6 +2858,8 @@ let oraclejre = lowPrio (pkgs.jdkdistro false false); + oraclejre7 = lowPrio (pkgs.oraclejdk7distro false false); + jrePlugin = lowPrio (pkgs.jdkdistro false true); supportsJDK = @@ -2869,8 +2881,6 @@ let julia = callPackage ../development/compilers/julia { liblapack = liblapack.override {shared = true;}; mpfr = mpfr_3_1_2; - fftw = fftw.override {pthreads = true;}; - fftwSinglePrec = fftwSinglePrec.override {pthreads = true;}; }; lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) { @@ -3379,6 +3389,11 @@ let spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { }; spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { }; + supercollider = callPackage ../development/interpreters/supercollider { + qt = qt4; + fftw = fftwSinglePrec; + }; + sysPerl = callPackage ../development/interpreters/perl/sys-perl { }; tcl = callPackage ../development/interpreters/tcl { }; @@ -4171,17 +4186,9 @@ let ffms = callPackage ../development/libraries/ffms { }; - fftw = callPackage ../development/libraries/fftw { - singlePrecision = false; - }; - - fftwFloat = callPackage ../development/libraries/fftw { - float = true; - }; - - fftwSinglePrec = callPackage ../development/libraries/fftw { - singlePrecision = true; - }; + fftw = callPackage ../development/libraries/fftw { }; + fftwSinglePrec = fftw.override { precision = "single"; }; + fftwFloat = fftwSinglePrec; # the configure option is just an alias flann = callPackage ../development/libraries/flann { }; @@ -6373,8 +6380,6 @@ let postgresql = postgresql92; - postgresql83 = callPackage ../servers/sql/postgresql/8.3.x.nix { }; - postgresql84 = callPackage ../servers/sql/postgresql/8.4.x.nix { }; postgresql90 = callPackage ../servers/sql/postgresql/9.0.x.nix { }; @@ -8203,6 +8208,8 @@ let id3v2 = callPackage ../applications/audio/id3v2 { }; + ifenslave = callPackage ../os-specific/linux/ifenslave { }; + ii = callPackage ../applications/networking/irc/ii { }; ike = callPackage ../applications/ike { }; @@ -8720,7 +8727,7 @@ let ratpoison = callPackage ../applications/window-managers/ratpoison { }; rawtherapee = callPackage ../applications/graphics/rawtherapee { - fftw = fftw.override {float = true;}; + fftw = fftwSinglePrec; }; rcs = callPackage ../applications/version-management/rcs { }; @@ -8812,9 +8819,7 @@ let libpng = libpng12; }; - smartdeblur = callPackage ../applications/graphics/smartdeblur { - fftw = fftw.override {pthreads = true;}; - }; + smartdeblur = callPackage ../applications/graphics/smartdeblur { }; sndBase = lowPrio (builderDefsPackage (import ../applications/audio/snd) { inherit fetchurl stdenv stringsWithDeps lib fftw; @@ -9420,6 +9425,8 @@ let naev = callPackage ../games/naev { }; + nexuiz = callPackage ../games/nexuiz { }; + njam = callPackage ../games/njam { }; oilrush = callPackage ../games/oilrush { }; @@ -9699,6 +9706,8 @@ let kbibtex = callPackage ../applications/office/kbibtex { }; + kde_gtk_config = callPackage ../tools/misc/kde-gtk-config { }; + kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { }; kdenlive = callPackage ../applications/video/kdenlive { }; @@ -9749,6 +9758,10 @@ let psi = callPackage ../applications/networking/instant-messengers/psi { }; + qtcurve = callPackage ../misc/themes/qtcurve { + stdenv = overrideGCC stdenv gcc47; + }; + quassel = callPackage ../applications/networking/irc/quassel { }; quasselDaemon = (self.quassel.override { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 38264d6c4b5a..47350533aeab 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -648,7 +648,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x brainfuck = callPackage ../development/libraries/haskell/brainfuck {}; - bson = callPackage ../development/libraries/haskell/bson {}; + bson = callPackage ../development/libraries/haskell/bson { + binary = self.binary_0_7_1_0; + dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_1_0; }; + }; boomerang = callPackage ../development/libraries/haskell/boomerang {}; diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 5aaff33ac4f9..671ea62785c3 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -22,6 +22,8 @@ ]; passthru.names = [ "CSSselect" ]; }; + by-spec."CSSselect"."~0.4.0" = + self.by-version."CSSselect"."0.4.0"; by-spec."CSSwhat"."0.4" = self.by-version."CSSwhat"."0.4.1"; by-version."CSSwhat"."0.4.1" = lib.makeOverridable self.buildNodePackage { @@ -614,14 +616,14 @@ by-spec."async"."~0.2.9" = self.by-version."async"."0.2.9"; by-spec."aws-sdk"."*" = - self.by-version."aws-sdk"."2.0.0-rc4"; - by-version."aws-sdk"."2.0.0-rc4" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-2.0.0-rc4"; + self.by-version."aws-sdk"."2.0.0-rc5"; + by-version."aws-sdk"."2.0.0-rc5" = lib.makeOverridable self.buildNodePackage { + name = "aws-sdk-2.0.0-rc5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc4.tgz"; - name = "aws-sdk-2.0.0-rc4.tgz"; - sha1 = "21c23ef7c162f7ec8eed36cef57e3425b0814e8d"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc5.tgz"; + name = "aws-sdk-2.0.0-rc5.tgz"; + sha1 = "488d4c5f28dae9cde8705d40f63f6f3ca91b351e"; }) ]; buildInputs = @@ -634,16 +636,16 @@ ]; passthru.names = [ "aws-sdk" ]; }; - "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc4"; + "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc5"; by-spec."aws-sdk".">=1.2.0 <2" = - self.by-version."aws-sdk"."1.16.0"; - by-version."aws-sdk"."1.16.0" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-1.16.0"; + self.by-version."aws-sdk"."1.17.0"; + by-version."aws-sdk"."1.17.0" = lib.makeOverridable self.buildNodePackage { + name = "aws-sdk-1.17.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.16.0.tgz"; - name = "aws-sdk-1.16.0.tgz"; - sha1 = "07a150d6009c2681d67b10faf9b356ddb70da952"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.17.0.tgz"; + name = "aws-sdk-1.17.0.tgz"; + sha1 = "766bbe426cd573ce339196a5b2fa431fea6130f5"; }) ]; buildInputs = @@ -1012,6 +1014,8 @@ "bower" = self.by-version."bower"."1.2.8"; by-spec."bower".">=0.9.0" = self.by-version."bower"."1.2.8"; + by-spec."bower".">=1.2.8 <2" = + self.by-version."bower"."1.2.8"; by-spec."bower"."~1.2.0" = self.by-version."bower"."1.2.8"; by-spec."bower-config"."~0.4.3" = @@ -1060,7 +1064,7 @@ ]; passthru.names = [ "bower-config" ]; }; - by-spec."bower-endpoint-parser"."~0.2.0" = + by-spec."bower-endpoint-parser"."0.2.1" = self.by-version."bower-endpoint-parser"."0.2.1"; by-version."bower-endpoint-parser"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "bower-endpoint-parser-0.2.1"; @@ -1079,7 +1083,9 @@ ]; passthru.names = [ "bower-endpoint-parser" ]; }; - by-spec."bower-json"."~0.4.0" = + by-spec."bower-endpoint-parser"."~0.2.0" = + self.by-version."bower-endpoint-parser"."0.2.1"; + by-spec."bower-json"."0.4.0" = self.by-version."bower-json"."0.4.0"; by-version."bower-json"."0.4.0" = lib.makeOverridable self.buildNodePackage { name = "bower-json-0.4.0"; @@ -1101,7 +1107,9 @@ ]; passthru.names = [ "bower-json" ]; }; - by-spec."bower-logger"."~0.2.1" = + by-spec."bower-json"."~0.4.0" = + self.by-version."bower-json"."0.4.0"; + by-spec."bower-logger"."0.2.1" = self.by-version."bower-logger"."0.2.1"; by-version."bower-logger"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "bower-logger-0.2.1"; @@ -1120,6 +1128,8 @@ ]; passthru.names = [ "bower-logger" ]; }; + by-spec."bower-logger"."~0.2.1" = + self.by-version."bower-logger"."0.2.1"; by-spec."bower-registry-client"."~0.1.4" = self.by-version."bower-registry-client"."0.1.6"; by-version."bower-registry-client"."0.1.6" = lib.makeOverridable self.buildNodePackage { @@ -1147,6 +1157,35 @@ ]; passthru.names = [ "bower-registry-client" ]; }; + by-spec."bower2nix"."*" = + self.by-version."bower2nix"."1.0.1"; + by-version."bower2nix"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "bower2nix-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bower2nix/-/bower2nix-1.0.1.tgz"; + name = "bower2nix-1.0.1.tgz"; + sha1 = "104417d000e525d5e4beb58ee5220e0e07cf378f"; + }) + ]; + buildInputs = + (self.nativeDeps."bower2nix" or []); + deps = [ + self.by-version."temp"."0.6.0" + self.by-version."fs.extra"."1.2.1" + self.by-version."bower-json"."0.4.0" + self.by-version."bower-endpoint-parser"."0.2.1" + self.by-version."bower-logger"."0.2.1" + self.by-version."bower"."1.2.8" + self.by-version."argparse"."0.1.15" + self.by-version."clone"."0.1.11" + self.by-version."semver"."2.2.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "bower2nix" ]; + }; + "bower2nix" = self.by-version."bower2nix"."1.0.1"; by-spec."broadway"."0.2.9" = self.by-version."broadway"."0.2.9"; by-version."broadway"."0.2.9" = lib.makeOverridable self.buildNodePackage { @@ -1392,7 +1431,7 @@ ]; passthru.names = [ "bunyan" ]; }; - by-spec."bytebuffer".">=2.2 && <3" = + by-spec."bytebuffer".">=2.2 <3" = self.by-version."bytebuffer"."2.3.1"; by-version."bytebuffer"."2.3.1" = lib.makeOverridable self.buildNodePackage { name = "bytebuffer-2.3.1"; @@ -1548,7 +1587,7 @@ buildInputs = (self.nativeDeps."chalk" or []); deps = [ - self.by-version."has-color"."0.1.1" + self.by-version."has-color"."0.1.2" self.by-version."ansi-styles"."0.1.2" ]; peerDependencies = [ @@ -1569,7 +1608,7 @@ buildInputs = (self.nativeDeps."chalk" or []); deps = [ - self.by-version."has-color"."0.1.1" + self.by-version."has-color"."0.1.2" self.by-version."ansi-styles"."0.2.0" ]; peerDependencies = [ @@ -1592,7 +1631,7 @@ buildInputs = (self.nativeDeps."chalk" or []); deps = [ - self.by-version."has-color"."0.1.1" + self.by-version."has-color"."0.1.2" self.by-version."ansi-styles"."0.2.0" ]; peerDependencies = [ @@ -1613,7 +1652,7 @@ buildInputs = (self.nativeDeps."chalk" or []); deps = [ - self.by-version."has-color"."0.1.1" + self.by-version."has-color"."0.1.2" self.by-version."ansi-styles"."1.0.0" self.by-version."strip-ansi"."0.1.1" ]; @@ -1665,6 +1704,29 @@ }; by-spec."cheerio"."~0.12.1" = self.by-version."cheerio"."0.12.4"; + by-spec."cheerio"."~0.13.0" = + self.by-version."cheerio"."0.13.0"; + by-version."cheerio"."0.13.0" = lib.makeOverridable self.buildNodePackage { + name = "cheerio-0.13.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cheerio/-/cheerio-0.13.0.tgz"; + name = "cheerio-0.13.0.tgz"; + sha1 = "44f5112044e0e0148300dd16bf8bbd7755ce65f1"; + }) + ]; + buildInputs = + (self.nativeDeps."cheerio" or []); + deps = [ + self.by-version."htmlparser2"."3.4.0" + self.by-version."underscore"."1.4.4" + self.by-version."entities"."0.3.0" + self.by-version."CSSselect"."0.4.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "cheerio" ]; + }; by-spec."cheerio-select"."*" = self.by-version."cheerio-select"."0.0.3"; by-version."cheerio-select"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -1761,15 +1823,35 @@ ]; passthru.names = [ "chownr" ]; }; + by-spec."class-extend"."~0.1.0" = + self.by-version."class-extend"."0.1.1"; + by-version."class-extend"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "class-extend-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/class-extend/-/class-extend-0.1.1.tgz"; + name = "class-extend-0.1.1.tgz"; + sha1 = "0feb1e59f4ace7bc163b509745f3282c4c7e528a"; + }) + ]; + buildInputs = + (self.nativeDeps."class-extend" or []); + deps = [ + self.by-version."lodash"."2.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "class-extend" ]; + }; by-spec."clean-css"."2.0.x" = - self.by-version."clean-css"."2.0.4"; - by-version."clean-css"."2.0.4" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-2.0.4"; + self.by-version."clean-css"."2.0.5"; + by-version."clean-css"."2.0.5" = lib.makeOverridable self.buildNodePackage { + name = "clean-css-2.0.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.4.tgz"; - name = "clean-css-2.0.4.tgz"; - sha1 = "1447e54e14d4bd0fa801f507bb32938cebe77627"; + url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.5.tgz"; + name = "clean-css-2.0.5.tgz"; + sha1 = "e693ca07bdbc69883665db6f8444d1af0442bbe3"; }) ]; buildInputs = @@ -1782,7 +1864,7 @@ passthru.names = [ "clean-css" ]; }; by-spec."clean-css"."~2.0.0" = - self.by-version."clean-css"."2.0.4"; + self.by-version."clean-css"."2.0.5"; by-spec."cli"."0.4.x" = self.by-version."cli"."0.4.5"; by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage { @@ -1846,6 +1928,25 @@ ]; passthru.names = [ "cliff" ]; }; + by-spec."clone"."0.1.11" = + self.by-version."clone"."0.1.11"; + by-version."clone"."0.1.11" = lib.makeOverridable self.buildNodePackage { + name = "clone-0.1.11"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/clone/-/clone-0.1.11.tgz"; + name = "clone-0.1.11.tgz"; + sha1 = "408b7d1773eb0dfbf2ddb156c1c47170c17e3a96"; + }) + ]; + buildInputs = + (self.nativeDeps."clone" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "clone" ]; + }; by-spec."clone"."0.1.5" = self.by-version."clone"."0.1.5"; by-version."clone"."0.1.5" = lib.makeOverridable self.buildNodePackage { @@ -2497,7 +2598,7 @@ buildInputs = (self.nativeDeps."connect-jade-static" or []); deps = [ - self.by-version."jade"."1.0.1" + self.by-version."jade"."1.0.2" ]; peerDependencies = [ ]; @@ -3502,6 +3603,26 @@ ]; passthru.names = [ "domhandler" ]; }; + by-spec."domhandler"."2.2" = + self.by-version."domhandler"."2.2.0"; + by-version."domhandler"."2.2.0" = lib.makeOverridable self.buildNodePackage { + name = "domhandler-2.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/domhandler/-/domhandler-2.2.0.tgz"; + name = "domhandler-2.2.0.tgz"; + sha1 = "ac9febfa988034b43f78ba056ebf7bd373416476"; + }) + ]; + buildInputs = + (self.nativeDeps."domhandler" or []); + deps = [ + self.by-version."domelementtype"."1.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "domhandler" ]; + }; by-spec."domutils"."1.1" = self.by-version."domutils"."1.1.6"; by-version."domutils"."1.1.6" = lib.makeOverridable self.buildNodePackage { @@ -4027,7 +4148,7 @@ self.by-version."request"."2.9.203" self.by-version."connect"."2.3.9" self.by-version."openid"."0.5.5" - self.by-version."xml2js"."0.4.0" + self.by-version."xml2js"."0.4.1" self.by-version."node-swt"."0.1.1" self.by-version."node-wsfederation"."0.1.1" self.by-version."debug"."0.5.0" @@ -4956,6 +5077,8 @@ ]; passthru.names = [ "fs.extra" ]; }; + by-spec."fs.extra".">=1.2.1 <2" = + self.by-version."fs.extra"."1.2.1"; by-spec."fstream"."0" = self.by-version."fstream"."0.1.25"; by-version."fstream"."0.1.25" = lib.makeOverridable self.buildNodePackage { @@ -5052,7 +5175,7 @@ ]; peerDependencies = [ self.by-version."generator-karma"."0.6.0" - self.by-version."yo"."1.0.7-pre.3" + self.by-version."yo"."1.1.0" ]; passthru.names = [ "generator-angular" ]; }; @@ -5074,7 +5197,7 @@ self.by-version."yeoman-generator"."0.13.4" ]; peerDependencies = [ - self.by-version."yo"."1.0.7-pre.3" + self.by-version."yo"."1.1.0" ]; passthru.names = [ "generator-karma" ]; }; @@ -5095,7 +5218,7 @@ self.by-version."yeoman-generator"."0.14.2" ]; peerDependencies = [ - self.by-version."yo"."1.0.7-pre.3" + self.by-version."yo"."1.1.0" ]; passthru.names = [ "generator-mocha" ]; }; @@ -5117,7 +5240,7 @@ self.by-version."cheerio"."0.12.4" ]; peerDependencies = [ - self.by-version."yo"."1.0.7-pre.3" + self.by-version."yo"."1.1.0" self.by-version."generator-mocha"."0.1.3" ]; passthru.names = [ "generator-webapp" ]; @@ -5491,7 +5614,7 @@ buildInputs = (self.nativeDeps."grunt-contrib-cssmin" or []); deps = [ - self.by-version."clean-css"."2.0.4" + self.by-version."clean-css"."2.0.5" self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ @@ -5672,9 +5795,9 @@ (self.nativeDeps."guifi-earth" or []); deps = [ self.by-version."coffee-script"."1.6.3" - self.by-version."jade"."1.0.1" + self.by-version."jade"."1.0.2" self.by-version."q"."0.9.7" - self.by-version."xml2js"."0.4.0" + self.by-version."xml2js"."0.4.1" self.by-version."msgpack"."0.2.1" ]; peerDependencies = [ @@ -5748,14 +5871,14 @@ by-spec."handlebars"."~1.0.11" = self.by-version."handlebars"."1.0.12"; by-spec."has-color"."~0.1.0" = - self.by-version."has-color"."0.1.1"; - by-version."has-color"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "has-color-0.1.1"; + self.by-version."has-color"."0.1.2"; + by-version."has-color"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "has-color-0.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/has-color/-/has-color-0.1.1.tgz"; - name = "has-color-0.1.1.tgz"; - sha1 = "28cc90127bc5448f99e76096dc97470a94a66720"; + url = "http://registry.npmjs.org/has-color/-/has-color-0.1.2.tgz"; + name = "has-color-0.1.2.tgz"; + sha1 = "c4a523038912451262c745e0a663c38d948098b4"; }) ]; buildInputs = @@ -6102,6 +6225,29 @@ ]; passthru.names = [ "htmlparser2" ]; }; + by-spec."htmlparser2"."~3.4.0" = + self.by-version."htmlparser2"."3.4.0"; + by-version."htmlparser2"."3.4.0" = lib.makeOverridable self.buildNodePackage { + name = "htmlparser2-3.4.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.4.0.tgz"; + name = "htmlparser2-3.4.0.tgz"; + sha1 = "a1cd65f5823ad285e19d63b085ad722d0a51eae7"; + }) + ]; + buildInputs = + (self.nativeDeps."htmlparser2" or []); + deps = [ + self.by-version."domhandler"."2.2.0" + self.by-version."domutils"."1.3.0" + self.by-version."domelementtype"."1.1.1" + self.by-version."readable-stream"."1.1.9" + ]; + peerDependencies = [ + ]; + passthru.names = [ "htmlparser2" ]; + }; by-spec."http-auth"."2.0.7" = self.by-version."http-auth"."2.0.7"; by-version."http-auth"."2.0.7" = lib.makeOverridable self.buildNodePackage { @@ -6462,6 +6608,30 @@ }; by-spec."inquirer"."~0.3.1" = self.by-version."inquirer"."0.3.5"; + by-spec."inquirer"."~0.4.0" = + self.by-version."inquirer"."0.4.0"; + by-version."inquirer"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "inquirer-0.4.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/inquirer/-/inquirer-0.4.0.tgz"; + name = "inquirer-0.4.0.tgz"; + sha1 = "62782d60c8a71d6328d8b4e9a5a71933cfda8f33"; + }) + ]; + buildInputs = + (self.nativeDeps."inquirer" or []); + deps = [ + self.by-version."lodash"."2.4.1" + self.by-version."async"."0.2.9" + self.by-version."cli-color"."0.2.3" + self.by-version."mute-stream"."0.0.4" + self.by-version."through"."2.3.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "inquirer" ]; + }; by-spec."insight"."~0.3.0" = self.by-version."insight"."0.3.0"; by-version."insight"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -6526,8 +6696,8 @@ self.by-version."fs-walk"."0.0.1" self.by-version."async"."0.2.9" self.by-version."express"."3.4.7" - self.by-version."jade"."1.0.1" - self.by-version."passport"."0.1.17" + self.by-version."jade"."1.0.2" + self.by-version."passport"."0.1.18" self.by-version."passport-http"."0.2.2" self.by-version."js-yaml"."3.0.1" self.by-version."mongoose"."3.8.3" @@ -6702,14 +6872,14 @@ passthru.names = [ "istanbul" ]; }; by-spec."jade"."*" = - self.by-version."jade"."1.0.1"; - by-version."jade"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "jade-1.0.1"; + self.by-version."jade"."1.0.2"; + by-version."jade"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "jade-1.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jade/-/jade-1.0.1.tgz"; - name = "jade-1.0.1.tgz"; - sha1 = "58c2471575d9b6f1c0bf8d2ecd00e5d366725c42"; + url = "http://registry.npmjs.org/jade/-/jade-1.0.2.tgz"; + name = "jade-1.0.2.tgz"; + sha1 = "86fed5d02d703f0309f06ddefa04a69fee00a2b1"; }) ]; buildInputs = @@ -6727,7 +6897,7 @@ ]; passthru.names = [ "jade" ]; }; - "jade" = self.by-version."jade"."1.0.1"; + "jade" = self.by-version."jade"."1.0.2"; by-spec."jade"."0.26.3" = self.by-version."jade"."0.26.3"; by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage { @@ -6771,7 +6941,7 @@ passthru.names = [ "jade" ]; }; by-spec."jade".">= 0.0.1" = - self.by-version."jade"."1.0.1"; + self.by-version."jade"."1.0.2"; by-spec."jayschema"."*" = self.by-version."jayschema"."0.2.2"; by-version."jayschema"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -7528,7 +7698,7 @@ self.by-version."mime"."1.2.11" self.by-version."request"."2.30.0" self.by-version."mkdirp"."0.3.5" - self.by-version."clean-css"."2.0.4" + self.by-version."clean-css"."2.0.5" self.by-version."source-map"."0.1.31" ]; peerDependencies = [ @@ -8925,7 +9095,7 @@ ]; passthru.names = [ "mute-stream" ]; }; - by-spec."mute-stream"."~0.0.4" = + by-spec."mute-stream"."0.0.4" = self.by-version."mute-stream"."0.0.4"; by-version."mute-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage { name = "mute-stream-0.0.4"; @@ -8944,6 +9114,8 @@ ]; passthru.names = [ "mute-stream" ]; }; + by-spec."mute-stream"."~0.0.4" = + self.by-version."mute-stream"."0.0.4"; by-spec."mv"."0.0.5" = self.by-version."mv"."0.0.5"; by-version."mv"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -9479,7 +9651,7 @@ buildInputs = (self.nativeDeps."node-wsfederation" or []); deps = [ - self.by-version."xml2js"."0.4.0" + self.by-version."xml2js"."0.4.1" ]; peerDependencies = [ ]; @@ -9527,14 +9699,14 @@ passthru.names = [ "nodemailer" ]; }; by-spec."nodemon"."*" = - self.by-version."nodemon"."1.0.1"; - by-version."nodemon"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "nodemon-1.0.1"; + self.by-version."nodemon"."1.0.2"; + by-version."nodemon"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "nodemon-1.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.1.tgz"; - name = "nodemon-1.0.1.tgz"; - sha1 = "0b69324abfadae00d1976150b3d8722e6516f47f"; + url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.2.tgz"; + name = "nodemon-1.0.2.tgz"; + sha1 = "f934df2f87a1b4718c283615d1f4f985b852e28e"; }) ]; buildInputs = @@ -9546,7 +9718,7 @@ ]; passthru.names = [ "nodemon" ]; }; - "nodemon" = self.by-version."nodemon"."1.0.1"; + "nodemon" = self.by-version."nodemon"."1.0.2"; by-spec."nomnom"."1.6.x" = self.by-version."nomnom"."1.6.2"; by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { @@ -9616,9 +9788,9 @@ name = "nopt-1.0.10"; src = [ (fetchurl { - url = "https://github.com/Filirom1/nopt/tarball/master#pull-request-in-progress"; + url = "http://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; name = "nopt-1.0.10.tgz"; - sha256 = "94daa53a0ab7668be12931b7b551c924c913d1efef7f2a05e60704c9b90a7bad"; + sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; }) ]; buildInputs = @@ -9659,14 +9831,14 @@ passthru.names = [ "normalize-package-data" ]; }; by-spec."npm"."*" = - self.by-version."npm"."1.3.22"; - by-version."npm"."1.3.22" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.3.22"; + self.by-version."npm"."1.3.23"; + by-version."npm"."1.3.23" = lib.makeOverridable self.buildNodePackage { + name = "npm-1.3.23"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.3.22.tgz"; - name = "npm-1.3.22.tgz"; - sha1 = "6ebc09f97f83ed3fd524b85faea5e30574e08c99"; + url = "http://registry.npmjs.org/npm/-/npm-1.3.23.tgz"; + name = "npm-1.3.23.tgz"; + sha1 = "8463ddbc060169b48890d639c4be9c839b8a0f3d"; }) ]; buildInputs = @@ -9723,9 +9895,9 @@ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."1.3.22"; + "npm" = self.by-version."npm"."1.3.23"; by-spec."npm"."~1.3.14" = - self.by-version."npm"."1.3.22"; + self.by-version."npm"."1.3.23"; by-spec."npm-registry-client"."0.2.27" = self.by-version."npm-registry-client"."0.2.27"; by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage { @@ -10373,6 +10545,28 @@ passthru.names = [ "p-throttler" ]; }; by-spec."passport"."*" = + self.by-version."passport"."0.1.18"; + by-version."passport"."0.1.18" = lib.makeOverridable self.buildNodePackage { + name = "passport-0.1.18"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/passport/-/passport-0.1.18.tgz"; + name = "passport-0.1.18.tgz"; + sha1 = "c8264479dcb6414cadbb66752d12b37e0b6525a1"; + }) + ]; + buildInputs = + (self.nativeDeps."passport" or []); + deps = [ + self.by-version."pkginfo"."0.2.3" + self.by-version."pause"."0.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "passport" ]; + }; + "passport" = self.by-version."passport"."0.1.18"; + by-spec."passport"."0.1.17" = self.by-version."passport"."0.1.17"; by-version."passport"."0.1.17" = lib.makeOverridable self.buildNodePackage { name = "passport-0.1.17"; @@ -10393,13 +10587,10 @@ ]; passthru.names = [ "passport" ]; }; - "passport" = self.by-version."passport"."0.1.17"; - by-spec."passport"."0.1.17" = - self.by-version."passport"."0.1.17"; by-spec."passport"."~0.1.1" = - self.by-version."passport"."0.1.17"; + self.by-version."passport"."0.1.18"; by-spec."passport"."~0.1.3" = - self.by-version."passport"."0.1.17"; + self.by-version."passport"."0.1.18"; by-spec."passport-http"."*" = self.by-version."passport-http"."0.2.2"; by-version."passport-http"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -10415,7 +10606,7 @@ (self.nativeDeps."passport-http" or []); deps = [ self.by-version."pkginfo"."0.2.3" - self.by-version."passport"."0.1.17" + self.by-version."passport"."0.1.18" ]; peerDependencies = [ ]; @@ -10437,7 +10628,7 @@ (self.nativeDeps."passport-local" or []); deps = [ self.by-version."pkginfo"."0.2.3" - self.by-version."passport"."0.1.17" + self.by-version."passport"."0.1.18" ]; peerDependencies = [ ]; @@ -10735,14 +10926,14 @@ passthru.names = [ "proto-list" ]; }; by-spec."protobufjs".">= 1.1.4" = - self.by-version."protobufjs"."2.0.2"; - by-version."protobufjs"."2.0.2" = lib.makeOverridable self.buildNodePackage { - name = "protobufjs-2.0.2"; + self.by-version."protobufjs"."2.0.3"; + by-version."protobufjs"."2.0.3" = lib.makeOverridable self.buildNodePackage { + name = "protobufjs-2.0.3"; src = [ (self.patchSource fetchurl { - url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.2.tgz"; - name = "protobufjs-2.0.2.tgz"; - sha1 = "35fc33b13142e31579104ea6b62f482cbe3e0ad7"; + url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.3.tgz"; + name = "protobufjs-2.0.3.tgz"; + sha1 = "a33bfa95cee12b182ef08c6f3e0a0b296167a67f"; }) ]; buildInputs = @@ -11260,9 +11451,7 @@ ]; passthru.names = [ "readable-stream" ]; }; - by-spec."readable-stream"."~1.0.2" = - self.by-version."readable-stream"."1.0.17"; - by-spec."readable-stream"."~1.1.8" = + by-spec."readable-stream"."1.1" = self.by-version."readable-stream"."1.1.9"; by-version."readable-stream"."1.1.9" = lib.makeOverridable self.buildNodePackage { name = "readable-stream-1.1.9"; @@ -11283,6 +11472,10 @@ ]; passthru.names = [ "readable-stream" ]; }; + by-spec."readable-stream"."~1.0.2" = + self.by-version."readable-stream"."1.0.17"; + by-spec."readable-stream"."~1.1.8" = + self.by-version."readable-stream"."1.1.9"; by-spec."readable-stream"."~1.1.9" = self.by-version."readable-stream"."1.1.9"; by-spec."readdirp"."~0.2.3" = @@ -11697,37 +11890,6 @@ ]; passthru.names = [ "request" ]; }; - by-spec."request"."~2.29.0" = - self.by-version."request"."2.29.0"; - by-version."request"."2.29.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.29.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.29.0.tgz"; - name = "request-2.29.0.tgz"; - sha1 = "0d4b8de70d26a9911a8344af9a0e8edab81ff1c3"; - }) - ]; - buildInputs = - (self.nativeDeps."request" or []); - deps = [ - self.by-version."qs"."0.6.6" - self.by-version."json-stringify-safe"."5.0.0" - self.by-version."forever-agent"."0.5.0" - self.by-version."node-uuid"."1.4.1" - self.by-version."mime"."1.2.11" - self.by-version."tough-cookie"."0.9.15" - self.by-version."form-data"."0.1.2" - self.by-version."tunnel-agent"."0.3.0" - self.by-version."http-signature"."0.10.0" - self.by-version."oauth-sign"."0.3.0" - self.by-version."hawk"."1.0.0" - self.by-version."aws-sign2"."0.5.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; - }; by-spec."request"."~2.30.0" = self.by-version."request"."2.30.0"; by-spec."request-progress"."~0.3.0" = @@ -11898,7 +12060,7 @@ buildInputs = (self.nativeDeps."rethinkdb" or []); deps = [ - self.by-version."protobufjs"."2.0.2" + self.by-version."protobufjs"."2.0.3" ]; peerDependencies = [ ]; @@ -12049,7 +12211,7 @@ buildInputs = (self.nativeDeps."s3http" or []); deps = [ - self.by-version."aws-sdk"."1.16.0" + self.by-version."aws-sdk"."1.17.0" self.by-version."commander"."2.0.0" self.by-version."http-auth"."2.0.7" self.by-version."express"."3.4.4" @@ -12124,7 +12286,24 @@ passthru.names = [ "sax" ]; }; by-spec."sax".">=0.4.2" = - self.by-version."sax"."0.5.8"; + self.by-version."sax"."0.6.0"; + by-version."sax"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "sax-0.6.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/sax/-/sax-0.6.0.tgz"; + name = "sax-0.6.0.tgz"; + sha1 = "7a155519b712e3ec56f102ab984f15e15d3859f0"; + }) + ]; + buildInputs = + (self.nativeDeps."sax" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "sax" ]; + }; by-spec."selenium-webdriver"."*" = self.by-version."selenium-webdriver"."2.39.0"; by-version."selenium-webdriver"."2.39.0" = lib.makeOverridable self.buildNodePackage { @@ -12209,6 +12388,8 @@ self.by-version."semver"."2.2.1"; by-spec."semver".">=2.0.10 <3.0.0" = self.by-version."semver"."2.2.1"; + by-spec."semver".">=2.2.1 <3" = + self.by-version."semver"."2.2.1"; by-spec."semver"."^2.2.1" = self.by-version."semver"."2.2.1"; by-spec."semver"."~1.1.0" = @@ -12869,14 +13050,14 @@ passthru.names = [ "ssh-agent" ]; }; by-spec."ssh2"."~0.2.14" = - self.by-version."ssh2"."0.2.14"; - by-version."ssh2"."0.2.14" = lib.makeOverridable self.buildNodePackage { - name = "ssh2-0.2.14"; + self.by-version."ssh2"."0.2.15"; + by-version."ssh2"."0.2.15" = lib.makeOverridable self.buildNodePackage { + name = "ssh2-0.2.15"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.14.tgz"; - name = "ssh2-0.2.14.tgz"; - sha1 = "6f93df62f1475cbe5b45924da568643b9ac7388a"; + url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.15.tgz"; + name = "ssh2-0.2.15.tgz"; + sha1 = "4bdd245a6764ec3cf9689c08aa8467bdedfb3cb0"; }) ]; buildInputs = @@ -13448,6 +13629,25 @@ ]; passthru.names = [ "throttleit" ]; }; + by-spec."through"."~2.3.4" = + self.by-version."through"."2.3.4"; + by-version."through"."2.3.4" = lib.makeOverridable self.buildNodePackage { + name = "through-2.3.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz"; + name = "through-2.3.4.tgz"; + sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455"; + }) + ]; + buildInputs = + (self.nativeDeps."through" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "through" ]; + }; by-spec."through2"."~0.1.0" = self.by-version."through2"."0.1.0"; by-version."through2"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -14042,13 +14242,13 @@ self.by-version."socket.io"."0.9.16" self.by-version."moment"."2.4.0" self.by-version."async"."0.2.9" - self.by-version."ssh2"."0.2.14" + self.by-version."ssh2"."0.2.15" self.by-version."rc"."0.3.2" self.by-version."uuid"."1.4.1" self.by-version."winston"."0.7.2" self.by-version."passport"."0.1.17" self.by-version."passport-local"."0.1.6" - self.by-version."npm"."1.3.22" + self.by-version."npm"."1.3.23" self.by-version."semver"."2.2.1" self.by-version."forever-monitor"."1.1.0" self.by-version."open"."0.0.4" @@ -14348,14 +14548,14 @@ passthru.names = [ "verror" ]; }; by-spec."view-helpers"."*" = - self.by-version."view-helpers"."0.1.3"; - by-version."view-helpers"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "view-helpers-0.1.3"; + self.by-version."view-helpers"."0.1.4"; + by-version."view-helpers"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "view-helpers-0.1.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.3.tgz"; - name = "view-helpers-0.1.3.tgz"; - sha1 = "97b061548a753eff5b432e6c1598cb10417bff02"; + url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.4.tgz"; + name = "view-helpers-0.1.4.tgz"; + sha1 = "aeadfbcc2c21343d2b0ef4d4f20f805764286cee"; }) ]; buildInputs = @@ -14366,7 +14566,7 @@ ]; passthru.names = [ "view-helpers" ]; }; - "view-helpers" = self.by-version."view-helpers"."0.1.3"; + "view-helpers" = self.by-version."view-helpers"."0.1.4"; by-spec."vows".">=0.5.13" = self.by-version."vows"."0.7.0"; by-version."vows"."0.7.0" = lib.makeOverridable self.buildNodePackage { @@ -14774,14 +14974,14 @@ }; "wu" = self.by-version."wu"."0.1.8"; by-spec."x509"."*" = - self.by-version."x509"."0.0.6"; - by-version."x509"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "x509-0.0.6"; + self.by-version."x509"."0.0.7"; + by-version."x509"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "x509-0.0.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/x509/-/x509-0.0.6.tgz"; - name = "x509-0.0.6.tgz"; - sha1 = "b58747854ff33df7ff8f1653756bff6a32a8c838"; + url = "http://registry.npmjs.org/x509/-/x509-0.0.7.tgz"; + name = "x509-0.0.7.tgz"; + sha1 = "198a57a9691649b030a383e0e5f89e635d6e99e7"; }) ]; buildInputs = @@ -14792,7 +14992,7 @@ ]; passthru.names = [ "x509" ]; }; - "x509" = self.by-version."x509"."0.0.6"; + "x509" = self.by-version."x509"."0.0.7"; by-spec."xml2js"."0.2.4" = self.by-version."xml2js"."0.2.4"; by-version."xml2js"."0.2.4" = lib.makeOverridable self.buildNodePackage { @@ -14807,7 +15007,7 @@ buildInputs = (self.nativeDeps."xml2js" or []); deps = [ - self.by-version."sax"."0.5.8" + self.by-version."sax"."0.6.0" ]; peerDependencies = [ ]; @@ -14834,14 +15034,14 @@ passthru.names = [ "xml2js" ]; }; by-spec."xml2js".">= 0.0.1" = - self.by-version."xml2js"."0.4.0"; - by-version."xml2js"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "xml2js-0.4.0"; + self.by-version."xml2js"."0.4.1"; + by-version."xml2js"."0.4.1" = lib.makeOverridable self.buildNodePackage { + name = "xml2js-0.4.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.0.tgz"; - name = "xml2js-0.4.0.tgz"; - sha1 = "124fc4114b4129c810800ecb2ac86cf25462cb9a"; + url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.1.tgz"; + name = "xml2js-0.4.1.tgz"; + sha1 = "dee0630173a5c6ea62797f848615fd55c6bc6992"; }) ]; buildInputs = @@ -14855,7 +15055,7 @@ passthru.names = [ "xml2js" ]; }; by-spec."xml2js".">=0.1.7" = - self.by-version."xml2js"."0.4.0"; + self.by-version."xml2js"."0.4.1"; by-spec."xmlbuilder"."0.4.2" = self.by-version."xmlbuilder"."0.4.2"; by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage { @@ -15053,20 +15253,20 @@ passthru.names = [ "yeoman-generator" ]; }; by-spec."yeoman-generator"."~0.15.0" = - self.by-version."yeoman-generator"."0.15.0-pre.3"; - by-version."yeoman-generator"."0.15.0-pre.3" = lib.makeOverridable self.buildNodePackage { - name = "yeoman-generator-0.15.0-pre.3"; + self.by-version."yeoman-generator"."0.15.0"; + by-version."yeoman-generator"."0.15.0" = lib.makeOverridable self.buildNodePackage { + name = "yeoman-generator-0.15.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.15.0-pre.3.tgz"; - name = "yeoman-generator-0.15.0-pre.3.tgz"; - sha1 = "49ded1ed00a2f27fe101ec11f2bf797c6ba9d81f"; + url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.15.0.tgz"; + name = "yeoman-generator-0.15.0.tgz"; + sha1 = "938eb791307cf9233bff3fd403302b5bc9cfe06a"; }) ]; buildInputs = (self.nativeDeps."yeoman-generator" or []); deps = [ - self.by-version."cheerio"."0.12.4" + self.by-version."cheerio"."0.13.0" self.by-version."rimraf"."2.2.5" self.by-version."diff"."1.0.8" self.by-version."mime"."1.2.11" @@ -15078,35 +15278,36 @@ self.by-version."isbinaryfile"."2.0.0" self.by-version."dargs"."0.1.0" self.by-version."async"."0.2.9" - self.by-version."inquirer"."0.3.5" + self.by-version."inquirer"."0.4.0" self.by-version."iconv-lite"."0.2.11" self.by-version."shelljs"."0.2.6" self.by-version."findup-sync"."0.1.2" - self.by-version."chalk"."0.3.0" + self.by-version."chalk"."0.4.0" self.by-version."text-table"."0.2.0" self.by-version."download"."0.1.7" - self.by-version."request"."2.29.0" + self.by-version."request"."2.30.0" self.by-version."file-utils"."0.1.5" + self.by-version."class-extend"."0.1.1" ]; peerDependencies = [ ]; passthru.names = [ "yeoman-generator" ]; }; by-spec."yo"."*" = - self.by-version."yo"."1.0.7-pre.3"; - by-version."yo"."1.0.7-pre.3" = lib.makeOverridable self.buildNodePackage { - name = "yo-1.0.7-pre.3"; + self.by-version."yo"."1.1.0"; + by-version."yo"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "yo-1.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/yo/-/yo-1.0.7-pre.3.tgz"; - name = "yo-1.0.7-pre.3.tgz"; - sha1 = "25b1f942b0d0e67a2f166503a7bf2d5202d60f6d"; + url = "http://registry.npmjs.org/yo/-/yo-1.1.0.tgz"; + name = "yo-1.1.0.tgz"; + sha1 = "4bc08291932442d1a3ad1e531702b1a76cdf2a16"; }) ]; buildInputs = (self.nativeDeps."yo" or []); deps = [ - self.by-version."yeoman-generator"."0.15.0-pre.3" + self.by-version."yeoman-generator"."0.15.0" self.by-version."nopt"."2.1.2" self.by-version."lodash"."2.4.1" self.by-version."update-notifier"."0.1.7" @@ -15124,11 +15325,11 @@ ]; passthru.names = [ "yo" ]; }; - "yo" = self.by-version."yo"."1.0.7-pre.3"; + "yo" = self.by-version."yo"."1.1.0"; by-spec."yo".">=1.0.0" = - self.by-version."yo"."1.0.7-pre.3"; + self.by-version."yo"."1.1.0"; by-spec."yo".">=1.0.0-rc.1.1" = - self.by-version."yo"."1.0.7-pre.3"; + self.by-version."yo"."1.1.0"; by-spec."zeparser"."0.0.5" = self.by-version."zeparser"."0.0.5"; by-version."zeparser"."0.0.5" = lib.makeOverridable self.buildNodePackage { diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index c11b7ee360ed..1d1abbc9ba28 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -112,4 +112,5 @@ , "posix" , "node-protobuf" , "rethinkdb" +, "bower2nix" ] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7318b2197f1..ee19aa850d39 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3439,14 +3439,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; - # not sure if this is the best way to accomplish this -- needed to provide - # objective-c compiler on darwin - matplotlibStdenv = if stdenv.isDarwin - then pkgs.clangStdenv - else pkgs.stdenv; - - # TODO: refactor to use pythonBuildPackage - matplotlib = matplotlibStdenv.mkDerivation (rec { + matplotlib = buildPythonPackage rec { name = "matplotlib-1.3.1"; src = fetchurl { @@ -3454,26 +3447,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { sha256 = "0smgpn7lwbn02nbyhawyn0n6r3pb65zk501f21bjgavnjjfnf5pa"; }; - # error: invalid command 'test' - doCheck = false; - - buildInputs = [ python pkgs.which pkgs.ghostscript ]; + buildInputs = [ python pkgs.which pkgs.ghostscript ] ++ + (if stdenv.isDarwin then [ pkgs.clangStdenv ] else [ pkgs.stdenv ]); propagatedBuildInputs = - [ dateutil nose numpy pyparsing tornado pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl - pkgs.tk pkgs.xlibs.libX11 ]; - - buildPhase = '' - sed -i '/use_setuptools/d' setup.py - ${python}/bin/${python.executable} setup.py build - ''; - - # The sed expression parses out the python version from an executable with appended characters - installPhase = '' - SITE="$out/lib/${python.libPrefix}/site-packages" - mkdir -p "$SITE" - PYTHONPATH="$PYTHONPATH:$SITE" ${python}/bin/${python.executable} setup.py install --prefix=$out - ''; + [ dateutil nose numpy pyparsing tornado pkgs.freetype pkgs.libpng pkgs.pkgconfig ]; meta = with stdenv.lib; { description = "python plotting library, making publication quality plots"; @@ -3481,7 +3459,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; - }); + }; mccabe = buildPythonPackage (rec { @@ -3944,6 +3922,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { checkPhase = if python.is_py3k or false then '' ${python}/bin/${python.executable} setup.py build_tests '' else "" + '' + rm functional_tests/test_multiprocessing/test_concurrent_shared.py # see https://github.com/nose-devs/nose/commit/226bc671c73643887b36b8467b34ad485c2df062 ${python}/bin/${python.executable} selftest.py ''; |