diff options
author | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-21 20:02:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-21 20:02:43 +0200 |
commit | 691ec455a8ab109394e82ec834f63ea88ca75ce8 (patch) | |
tree | 2be9fd0b24cfee2fc73a07391338fa0bfb503496 /pkgs | |
parent | 1cbc8c1e573f761e53f5ee62fdd30cb930771c60 (diff) | |
parent | bcb5005a4db1a1aaa14f667ca066e97ba802ba6d (diff) | |
download | nixlib-691ec455a8ab109394e82ec834f63ea88ca75ce8.tar nixlib-691ec455a8ab109394e82ec834f63ea88ca75ce8.tar.gz nixlib-691ec455a8ab109394e82ec834f63ea88ca75ce8.tar.bz2 nixlib-691ec455a8ab109394e82ec834f63ea88ca75ce8.tar.lz nixlib-691ec455a8ab109394e82ec834f63ea88ca75ce8.tar.xz nixlib-691ec455a8ab109394e82ec834f63ea88ca75ce8.tar.zst nixlib-691ec455a8ab109394e82ec834f63ea88ca75ce8.zip |
Merge pull request #45246 from r-ryantm/auto-update/couchdb
couchdb2: 2.1.2 -> 2.2.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/interpreters/spidermonkey/1.8.5.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/http/couchdb/2.0.0.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index f333aa0b96d0..bd53450de4ef 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; + broken = stdenv.isAarch64; # 2018-08-21, broken since 2017-03-08 }; } diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix index 80caa3779912..6e52bdc32707 100644 --- a/pkgs/servers/http/couchdb/2.0.0.nix +++ b/pkgs/servers/http/couchdb/2.0.0.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "couchdb-${version}"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz"; - sha256 = "1c1ghrmrcyjd3s3pzml6akxf8xxcqy4mfzn5xf8jg158dzarmk53"; + sha256 = "11brqv302j999sd5x8amhj9iqns9cbrlkjg2l9a8xbvkmf5fng0f"; }; nativeBuildInputs = [ makeWrapper ]; |