diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-08-02 18:28:29 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-08-02 18:30:53 +0200 |
| commit | 625f40151b0767cb421999cf988f4eb7bcf8b63d (patch) | |
| tree | 629565f6f9efb26ad36b2a6d8e7e266290feb94b /pkgs/servers/nosql | |
| parent | d239d24a89276cc7ee4bab1343c7e5bb40cbdfd4 (diff) | |
| parent | 4fb87e91ffcbf6f6785e32b7e608198401a7155d (diff) | |
| download | nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.gz nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.bz2 nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.lz nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.xz nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.zst nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.zip | |
Merge branch 'master' into x-updates
Conflicts (a little tricky, I did some cleanup of interacting changes): pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/libpng/default.nix pkgs/tools/package-management/nixops/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/servers/nosql')
| -rw-r--r-- | pkgs/servers/nosql/mongodb/default.nix | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 612db162e5c5..11dff3244208 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -1,25 +1,15 @@ { stdenv, fetchurl, scons, boost, v8, gperftools, pcre, snappy }: -with stdenv.lib; - -let installerPatch = fetchurl { - url = "https://jira.mongodb.org/secure/attachment/18160/SConscript.client.patch"; - sha256 = "0n60fh2r8i7m6g113k0iw4adc8jv2by4ahrd780kxg47kzfgw06a"; - }; - -in -stdenv.mkDerivation rec { - name = "mongodb-2.4.3"; +let version = "2.4.5"; in stdenv.mkDerivation rec { + name = "mongodb-${version}"; src = fetchurl { - url = http://downloads.mongodb.org/src/mongodb-src-r2.4.3.tar.gz; - sha256 = "1k653xmwphdk88z2byz5fglr8xcsm8nw13prls1rx16qnc6h1pb1"; + url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; + sha256 = "01c7lb3jdr51gy7459vg5rg002xxg0mj79vlhy54n50kr31cnxmm"; }; nativeBuildInputs = [ scons boost v8 gperftools pcre snappy ]; - patches = [ installerPatch ]; - postPatch = '' substituteInPlace SConstruct \ --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" \ |