diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/nosql/mongodb/default.nix | 31 | ||||
-rw-r--r-- | pkgs/servers/nosql/rethinkdb/default.nix | 11 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 12 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 4 |
4 files changed, 34 insertions, 24 deletions
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index a5a021b93545..78792c3a4f72 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -1,29 +1,40 @@ -{ stdenv, fetchurl, scons, boost, v8_3_14, gperftools, pcre, snappy }: - -let version = "2.4.8"; in stdenv.mkDerivation rec { +{ stdenv, fetchurl, scons, boost, gperftools, pcre, snappy }: + +let version = "2.6.0"; + system-libraries = [ + "tcmalloc" + "pcre" + "boost" + "snappy" + # "v8" -- mongo still bundles 3.12 and does not work with 3.15+ + # "stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs) + # "yaml" -- it seems nixpkgs' yamlcpp (0.5.1) is problematic for mongo + ]; + system-lib-args = stdenv.lib.concatStringsSep " " + (map (lib: "--use-system-${lib}") system-libraries); + +in stdenv.mkDerivation rec { name = "mongodb-${version}"; src = fetchurl { url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "1p6gnharypglfp39halp72fig96fqjhakyy7m76a1prxwpjkqw7x"; + sha256 = "066kppjdmdpadjr09ildla3aw42anzsc9pa55iwp3wa4rgqd2i33"; }; - nativeBuildInputs = [ scons boost v8_3_14 gperftools pcre snappy ]; + nativeBuildInputs = [ scons boost gperftools pcre snappy ]; postPatch = '' substituteInPlace SConstruct \ - --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" \ - --replace 'CCFLAGS=["-Werror", "-pipe"]' 'CCFLAGS=["-pipe"]' + --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" ''; buildPhase = '' - export SCONSFLAGS="-j$NIX_BUILD_CORES" - scons all --use-system-all + scons all --release ${system-lib-args} ''; installPhase = '' mkdir -p $out/lib - scons install --use-system-all --full --prefix=$out + scons install --release --prefix=$out ${system-lib-args} ''; meta = { diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index ec1dbd763646..67dff3f6572e 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, which, protobuf, v8_3_14, ncurses, gperftools, boost, m4 }: +{ stdenv, fetchurl, which, protobuf, gperftools, boost, zlib, python, m4 }: stdenv.mkDerivation rec { - name = "rethinkdb-1.11.2"; + name = "rethinkdb-1.12.4"; src = fetchurl { url = "http://download.rethinkdb.com/dist/${name}.tgz"; - sha256 = "04wz07y891vygc5ksrvkk1ch05xj16nahv20bnxwcllkbl4gf9lj"; + sha256 = "1dq2vbgms016ic2hifclm1m58i4804khkn0lnvz47rkm7i0564if"; }; preConfigure = '' @@ -15,10 +15,9 @@ stdenv.mkDerivation rec { configureFlags = "--lib-path ${gperftools}/lib"; - buildInputs = [ protobuf v8_3_14 ncurses boost ]; - - nativeBuildInputs = [ which m4 ]; + buildInputs = [ protobuf zlib boost ]; + nativeBuildInputs = [ which m4 python ]; meta = { description = "An open-source distributed database built with love"; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 07a6282a085c..1c9f81e96e16 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1370,11 +1370,11 @@ let })) // {inherit ;}; xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) { - name = "xf86-input-evdev-2.8.2"; + name = "xf86-input-evdev-2.8.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.8.2.tar.bz2; - sha256 = "1cvyg425px92hr5ql1s7v0c7n9jyvg0aaajrf5vyxgc3k9s6213m"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.8.3.tar.bz2; + sha256 = "1c067h0452728s39rb1csw4r26ihdhzs4nr722z6gg9mhvb7zv02"; }; buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; })) // {inherit inputproto udev xorgserver xproto ;}; @@ -1410,11 +1410,11 @@ let })) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) { - name = "xf86-input-synaptics-1.7.4"; + name = "xf86-input-synaptics-1.7.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.4.tar.bz2; - sha256 = "1xssjj0qxarzsc4m69ay5ydkwgq27qajzih2c7sjk7nkgggx58jn"; + url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.5.tar.bz2; + sha256 = "1iwiihwbqiq2lxd12ca7j3ajggjbmlk33wsfv2lyyizp3x92710z"; }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index a05241350fd6..68d1157c62e7 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -115,11 +115,11 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.8.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.8.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.7.4.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 |