From d77095c97ac6325bfab0762283f3414c97eef698 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 13 Jul 2019 11:02:48 -0400 Subject: [PATCH 01/10] pantheon.cerbere: 0.2.4 -> 2.5.0 Fixes #60955 --- pkgs/desktops/pantheon/services/cerbere/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/services/cerbere/default.nix b/pkgs/desktops/pantheon/services/cerbere/default.nix index da5e544b005..28e39464bfa 100644 --- a/pkgs/desktops/pantheon/services/cerbere/default.nix +++ b/pkgs/desktops/pantheon/services/cerbere/default.nix @@ -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 = { From 790e8f451df42cc68e2f73420faa586ae29f4295 Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Fri, 2 Aug 2019 12:27:34 +0200 Subject: [PATCH 02/10] atlassian-jira: 8.2.3 -> 8.3.0 --- pkgs/servers/atlassian/jira.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 6f738762a10..5bd91b14f32 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -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" ]; From 6a22620c5b13a989f8532e01f709395287dfe67d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 2 Aug 2019 20:19:02 +0300 Subject: [PATCH 03/10] qmapshack: use Qt mkDerivation --- pkgs/applications/misc/qmapshack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix index b38369babe8..f7a8bc0e3a1 100644 --- a/pkgs/applications/misc/qmapshack/default.nix +++ b/pkgs/applications/misc/qmapshack/default.nix @@ -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; From 5304191cd70e43a983a4c06d3b7bb2616e50d9eb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 2 Aug 2019 09:03:55 -0700 Subject: [PATCH 04/10] pyload: fix build --- pkgs/applications/networking/pyload/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix index 6a89731ff10..3df21d414e0 100644 --- a/pkgs/applications/networking/pyload/default.nix +++ b/pkgs/applications/networking/pyload/default.nix @@ -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; }; } From 2d09016ed37982e52c13a94915263c73a7412b69 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Sat, 3 Aug 2019 00:19:14 +0200 Subject: [PATCH 05/10] grafana-loki: 0.1.0 -> 0.2.0 --- pkgs/servers/monitoring/loki/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 63bded64a36..223026c3b41 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -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; }; From 52b665113235d08c568eb4cbbb14c0b88ec7beba Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 2 Aug 2019 18:08:51 -0700 Subject: [PATCH 06/10] pythonPackages.pytest-cram: fix build --- pkgs/development/python-modules/pytest-cram/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix index 9639bd7f778..ff2a29384bc 100644 --- a/pkgs/development/python-modules/pytest-cram/default.nix +++ b/pkgs/development/python-modules/pytest-cram/default.nix @@ -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 = { From 6e880c201f5823213bd481140ab064d3b147a558 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 2 Aug 2019 15:50:04 -0700 Subject: [PATCH 07/10] pythonPackages.nbval: 0.9.1 -> 0.9.2 --- pkgs/development/python-modules/nbval/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index c9ab72894ef..a0e6982f5e4 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -15,19 +15,20 @@ buildPythonPackage rec { pname = "nbval"; - version = "0.9.1"; + version = "0.9.2"; src = fetchPypi { inherit pname version; - sha256 = "3f18b87af4e94ccd073263dd58cd3eebabe9f5e4d6ab535b39d3af64811c7eda"; + sha256 = "0g8xl4158ngyhiynrkk72jpawnk4isznbijz0w085g269fps0vp2"; }; LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; - checkInputs = [ matplotlib sympy pytestcov ]; + checkInputs = [ matplotlib sympy pytestcov pytest ]; propagatedBuildInputs = [ coverage ipykernel jupyter_client nbformat pytest six ]; + # ignore impure tests checkPhase = '' pytest tests --current-env --ignore tests/test_timeouts.py ''; From 0bca1209e53c52d4109d86f70bdea55ade6615b4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 2 Aug 2019 14:40:37 -0700 Subject: [PATCH 08/10] python3Packages.ipykernel: 5.1.0 -> 5.1.1 --- pkgs/development/python-modules/ipykernel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 043f58cfa5d..5203047b77f 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "5.1.0"; + version = "5.1.1"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "0fc0bf97920d454102168ec2008620066878848fcfca06c22b669696212e292f"; + sha256 = "173nm29g85w8cac3fg40b27qaq26g41wgg6qn79ql1hq4w2n5sgh"; }; checkInputs = [ pytest nose ]; From 9ef0b35a63558cf656b8db31550ed700c81528e9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 2 Aug 2019 08:20:14 -0700 Subject: [PATCH 09/10] pythonPackages.msreset: 0.6.8 -> 0.6.9 --- pkgs/development/python-modules/msrest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index 4b6a617c018..ede8e0801df 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -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 = [ From 49f281d287d7f31079994b06235efa508585001e Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 3 Aug 2019 10:12:08 +0800 Subject: [PATCH 10/10] font-awesome: 5.10.0 -> 5.10.1 --- pkgs/data/fonts/font-awesome-5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix index 39472122317..451e3feecb6 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -39,7 +39,7 @@ in { sha256 = "1j8i32dq6rrlv3kf2hnq81iqks06kczaxjks7nw3zyq1231winm9"; }; v5 = font-awesome { - version = "5.10.0"; - sha256 = "11nga1drlpkrmw307ga6plbj5z1b70cnckr465z8z6vkbcd6jkv3"; + version = "5.10.1"; + sha256 = "1ckr7n0hlhvyl8nkhyjr7k6r07czpcfp0s2mnb48mvfgxd3j992p"; }; }