public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging' into staging-next

Browse Source 
It turned out we additionally need sqlite bump for firefox 74.
This commit is contained in:
Vladimír Čunát 2020-03-10 19:35:27 +01:00
commit b693c8c7be
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/sqlite/default.nix
View File

@ -10,12 +10,12 @@ in
stdenv.mkDerivation rec {
pname = "sqlite";
version = "3.31.0";
version = "3.31.1";
# NB! Make sure to update analyzer.nix src (in the same directory).
src = fetchurl {
url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz";
sha256 = "1w7i954349sjd5a6rvy118prra43k07y9hy8rpajs6vmjmnnx7bw";
sha256 = "1bj936svd8i5g25xd1bj52hj4zca01fgl3sqkj86z9q5pkz4wa32";
};
outputs = [ "bin" "dev" "out" ];
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
downloadPage = https://sqlite.org/download.html;
homepage = https://www.sqlite.org/;
homepage = "https://www.sqlite.org/";
license = licenses.publicDomain;
maintainers = with maintainers; [ eelco np ];
platforms = platforms.unix ++ platforms.windows;

11
pkgs/servers/amqp/rabbitmq-server/default.nix
View File

@ -2,17 +2,18 @@
, docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync, getconf, socat
, procps, coreutils, gnused, systemd, glibcLocales
, AppKit, Carbon, Cocoa
, nixosTests
}:
stdenv.mkDerivation rec {
pname = "rabbitmq-server";
version = "3.8.2";
version = "3.8.3";
# when updating, consider bumping elixir version in all-packages.nix
src = fetchurl {
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "17gixahxass9n4d697my8sq4an51rw3cicb36fqvl8fbhnwjjrwc";
sha256 = "1fhs3g2pgrq2xi4hnlc437hkv3261l4i134m6mxid00sf1c89p5f";
};
buildInputs =
@ -59,10 +60,14 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = https://www.rabbitmq.com/;
homepage = "https://www.rabbitmq.com/";
description = "An implementation of the AMQP messaging protocol";
license = stdenv.lib.licenses.mpl11;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ Profpatsch ];
};
passthru.tests = {
vm-test = nixosTests.rabbitmq;
};
}