Merge pull request #231193 from mweinelt/couchdb-3.3.2

couchdb3: 3.3.1 -> 3.3.2

authored by Martin Weinelt and committed by GitHub 4579dfb9 f212785e

+34 -10
+34 -10
pkgs/servers/http/couchdb/3.nix
··· 1 - { lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_91 2 - , coreutils, bash, python3, nixosTests }: 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , erlang 5 + , icu 6 + , openssl 7 + , spidermonkey_91 8 + , python3 9 + , nixosTests 10 + }: 3 11 4 12 stdenv.mkDerivation rec { 5 13 pname = "couchdb"; 6 - version = "3.3.1"; 14 + version = "3.3.2"; 7 15 8 16 src = fetchurl { 9 17 url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; 10 - sha256 = "sha256-m4nXtU9+9StCvVGmoKLTsbBszjld8smdjx9H+TVeK+4="; 18 + hash = "sha256-PWgj1C0Qzw1PhsnE/lnJkyyJ1oV4/LbEtCeNx2kwjao="; 11 19 }; 12 20 13 - nativeBuildInputs = [ 14 - erlang 15 - ]; 16 - buildInputs = [ icu openssl spidermonkey_91 (python3.withPackages(ps: with ps; [ requests ]))]; 17 21 postPatch = '' 18 22 substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-91' "${spidermonkey_91.dev}/include/mozjs-91" 23 + substituteInPlace configure --replace '/usr/include/''${SM_HEADERS}' "${spidermonkey_91.dev}/include/mozjs-91" 19 24 patchShebangs bin/rebar 20 25 ''; 21 26 27 + nativeBuildInputs = [ 28 + erlang 29 + ]; 30 + 31 + buildInputs = [ 32 + icu 33 + openssl 34 + spidermonkey_91 35 + (python3.withPackages(ps: with ps; [ requests ])) 36 + ]; 37 + 22 38 dontAddPrefix= "True"; 23 - configureFlags = ["--spidermonkey-version=91"]; 24 - buildFlags = ["release"]; 39 + 40 + configureFlags = [ 41 + "--spidermonkey-version=91" 42 + ]; 43 + 44 + buildFlags = [ 45 + "release" 46 + ]; 25 47 26 48 installPhase = '' 49 + runHook preInstall 27 50 mkdir -p $out 28 51 cp -r rel/couchdb/* $out 52 + runHook postInstall 29 53 ''; 30 54 31 55 passthru.tests = {