Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2019-08-03 07:47:54 +02:00
commit fbf4028074
10 changed files with 33 additions and 22 deletions

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }:
{ mkDerivation, lib, fetchurl, fetchpatch, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }:
stdenv.mkDerivation rec {
mkDerivation rec {
name = "qmapshack-${version}";
version = "1.13.0";
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
})
];
meta = with stdenv.lib; {
meta = with lib; {
homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home;
description = "Plan your next outdoor trip";
license = licenses.gpl3;

View File

@ -45,16 +45,16 @@ in pythonPackages.buildPythonApplication rec {
'';
preBuild = ''
paver generate_setup
${pythonPackages.paver}/bin/paver generate_setup
'';
doCheck = false;
meta = {
meta = with stdenv.lib; {
description = "Free and open source downloader for 1-click-hosting sites";
homepage = https://github.com/pyload/pyload;
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.mahe ];
platforms = stdenv.lib.platforms.all;
license = licenses.gpl3;
maintainers = [ maintainers.mahe ];
platforms = platforms.all;
};
}

View File

@ -39,7 +39,7 @@ in {
sha256 = "1j8i32dq6rrlv3kf2hnq81iqks06kczaxjks7nw3zyq1231winm9";
};
v5 = font-awesome {
version = "5.10.0";
sha256 = "11nga1drlpkrmw307ga6plbj5z1b70cnckr465z8z6vkbcd6jkv3";
version = "5.10.1";
sha256 = "1ckr7n0hlhvyl8nkhyjr7k6r07czpcfp0s2mnb48mvfgxd3j992p";
};
}

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cerbere";
version = "0.2.4";
version = "2.5.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0f9jr6q5z6nir5b77f96wm9rx6r6s9i0sr1yrymg3n7jyjgrvdwp";
sha256 = "12y6gg4vyc1rhdm2c7pr7bgmdrah7ddphyh25fgh3way8l9gh7vw";
};
passthru = {

View File

@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "f0e962052718068ad3b1d8bcc703794660858f58803c3798628817f492a8769c";
sha256 = "173nm29g85w8cac3fg40b27qaq26g41wgg6qn79ql1hq4w2n5sgh";
};
checkInputs = [ pytest nose ];

View File

@ -18,7 +18,7 @@
}:
buildPythonPackage rec {
version = "0.6.8";
version = "0.6.9";
pname = "msrest";
# no tests in PyPI tarball
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "Azure";
repo = "msrest-for-python";
rev = "v${version}";
sha256 = "1vnh0y68vqf7hwhghbf6bjadrzlv98aj4vfz6g592lww3ijpy77w";
sha256 = "0540dmxz90jsmwvd4q06cr1ficixknjk8q06f2dqcp06w92vnl8r";
};
propagatedBuildInputs = [

View File

@ -29,6 +29,8 @@ buildPythonPackage rec {
pytestcov
];
buildInputs = [ glibcLocales ];
propagatedBuildInputs = [
coverage
ipykernel
@ -38,6 +40,7 @@ buildPythonPackage rec {
six
];
# ignore impure tests
checkPhase = ''
pytest tests --ignore tests/test_timeouts.py
'';

View File

@ -22,7 +22,7 @@ buildPythonPackage rec {
# the imported and collected modules are different.
checkPhase = ''
rm pytest_cram/tests/__init__.py
pytest pytest_cram
pytest pytest_cram/ --ignore=pytest_cram/tests/test_examples.py
'';
meta = {

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "atlassian-jira-${version}";
version = "8.2.3";
version = "8.3.0";
src = fetchurl {
url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
sha256 = "1078s225rb44y7nfsvd1vba9jjn14rdsxvdgah164i0nd16070sn";
sha256 = "10hnanvlnl1szp3qdcyrivhayydw8qbw1rq7vmvay434ch6wwgkx";
};
phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];

View File

@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }:
buildGoPackage rec {
version = "0.1.0";
version = "0.2.0";
name = "grafana-loki-${version}";
goPackagePath = "github.com/grafana/loki";
@ -11,13 +11,21 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "loki";
sha256 = "18iysr8p84vd1sdjdnpc9cydd5rpw0azdjzpz8yjqhscqw9gk4w2";
sha256 = "1f4g5qiarhsa1r7vdx1z30zpqlypd4cf5anj4jp6nc9q6zmjwk91";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ systemd.dev ];
preFixup = ''
wrapProgram $bin/bin/promtail \
--prefix LD_LIBRARY_PATH : "${systemd.lib}/lib"
'';
meta = with stdenv.lib; {
description = "Like Prometheus, but for logs.";
license = licenses.asl20;
homepage = https://grafana.com/loki;
homepage = "https://grafana.com/loki";
maintainers = with maintainers; [ willibutz ];
platforms = platforms.linux;
};