From be8129be330d6f21d7ff1dfe41dd53d0388e49a8 Mon Sep 17 00:00:00 2001 From: Hutzdog Date: Sat, 10 Apr 2021 14:59:02 -0700 Subject: [PATCH 01/20] maintainers: add enderger --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 969d6ab338e2..09fe165cac28 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2731,6 +2731,12 @@ githubId = 18535642; name = "Emily"; }; + enderger = { + email = "endergeryt@gmail.com"; + github = "enderger"; + githubId = 36283171; + name = "Daniel"; + }; endocrimes = { email = "dani@builds.terrible.systems"; github = "endocrimes"; From 4716a0e6d45a9e85b8fc87b3e0c70f49d3001026 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 13 Apr 2021 04:20:00 +0000 Subject: [PATCH 02/20] tmux: 3.1c -> 3.2 https://github.com/tmux/tmux/raw/3.2/CHANGES --- pkgs/tools/misc/tmux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 534fe54bc187..7fcd5322c2cb 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { pname = "tmux"; - version = "3.1c"; + version = "3.2"; outputs = [ "out" "man" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "1fqgpzfas85dn0sxlvvg6rj488jwgnxs8d3gqcm8lgs211m9qhcf"; + sha256 = "0alq81h1rz1f0zsy8qb2dvsl47axpa86j4bplngwkph0ksqqgr3p"; }; nativeBuildInputs = [ @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { * Terminal locking, manually or after a timeout. * A clean, easily extended, BSD-licensed codebase, under active development. ''; - + changelog = "https://github.com/tmux/tmux/raw/${version}/CHANGES"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; From 223cfe967c8bf94dfc144d95c7f29087744553ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Apr 2021 08:55:25 +0200 Subject: [PATCH 03/20] python3Packages.pyroute2: 0.5.14 -> 0.5.18 --- pkgs/development/python-modules/pyroute2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index e5c87a94b074..a1acee1db9a9 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.14"; + version = "0.5.18"; src = fetchPypi { inherit pname version; - sha256 = "774c5ecf05fe40f0f601a7ab33c19ca0b24f00bf4a094e58deaa5333b7ca49b5"; + sha256 = "sha256-CKxAytUsC7Lg8gCHUgWZqpH8zgsiHdJukEIzBCiBC8U="; }; # requires root priviledges From 6f2cc4b839ef2d7e543b6f277ebc56269885d5b9 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 9 Apr 2021 23:20:35 +0200 Subject: [PATCH 04/20] drumgizmo: 0.9.18.1 -> 0.9.19 --- pkgs/applications/audio/drumgizmo/default.nix | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index dfaf7127f4bc..ef4970a16080 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -1,37 +1,29 @@ -{ lib, stdenv, fetchurl, fetchpatch, alsaLib, expat, glib, libjack2, libXext, libX11, libpng +{ lib, stdenv, fetchurl, alsaLib, expat, glib, libjack2, libXext, libX11, libpng , libpthreadstubs, libsmf, libsndfile, lv2, pkg-config, zita-resampler }: stdenv.mkDerivation rec { - version = "0.9.18.1"; + version = "0.9.19"; pname = "drumgizmo"; src = fetchurl { url = "https://www.drumgizmo.org/releases/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0bpbkzcr3znbwfdk79c14n5k5hh80iqlk2nc03q95vhimbadk8k7"; + sha256 = "18x28vhif0c97xz02k22xwqxxig6fi6j0356mlz2vf7vb25z69kl"; }; - patches = [ - # Fix build for lv2 1.18.0 - (fetchpatch { - url = "http://cgit.drumgizmo.org/plugingizmo.git/patch/?id=be64ddf9da525cd5c6757464efc966052731ba71"; - sha256 = "17w8g78i5avssc7m8rpw64ka3rai8dff81wfzir9cpxp8s2h44qf"; - extraPrefix = "plugin/plugingizmo/"; - stripLen = 1; - }) - ]; - configureFlags = [ "--enable-lv2" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsaLib expat glib libjack2 libXext libX11 libpng libpthreadstubs - libsmf libsndfile lv2 pkg-config zita-resampler + libsmf libsndfile lv2 zita-resampler ]; meta = with lib; { description = "An LV2 sample based drum plugin"; homepage = "https://www.drumgizmo.org"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu maintainers.nico202 ]; }; From 2e2b67bc528de96ac4c1edd0ed2560dca355f4fc Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 12 Apr 2021 10:50:28 +0200 Subject: [PATCH 05/20] pythonPackages.woob: init at 3.0 --- .../python-modules/woob/default.nix | 82 +++++++++++++++++++ .../woob/no-test-requiring-network.patch | 54 ++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 138 insertions(+) create mode 100644 pkgs/development/python-modules/woob/default.nix create mode 100644 pkgs/development/python-modules/woob/no-test-requiring-network.patch diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix new file mode 100644 index 000000000000..15f2faa200ca --- /dev/null +++ b/pkgs/development/python-modules/woob/default.nix @@ -0,0 +1,82 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, Babel +, colorama +, cssselect +, dateutil +, feedparser +, futures +, gdata +, gnupg +, google-api-python-client +, html2text +, libyaml +, lxml +, mechanize +, nose +, pdfminer +, pillow +, prettytable +, pyqt5 +, pyyaml +, requests +, simplejson +, termcolor +, unidecode +}: + +buildPythonPackage rec { + pname = "woob"; + version = "3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "09hpxy5zhn2b8li0xjf3zd7s46lawb0315p5mdcsci3bj3s4v1j7"; + }; + + patches = [ + # Disable doctests that require networking: + ./no-test-requiring-network.patch + ]; + + checkInputs = [ nose ]; + + nativeBuildInputs = [ pyqt5 ]; + + propagatedBuildInputs = [ + Babel + colorama + cssselect + dateutil + feedparser + gdata + gnupg + google-api-python-client + html2text + libyaml + lxml + mechanize + pdfminer + pillow + prettytable + pyqt5 + pyyaml + requests + simplejson + termcolor + unidecode + ] ++ lib.optionals isPy27 [ futures ]; + + checkPhase = '' + nosetests + ''; + + meta = with lib; { + homepage = "https://woob.tech"; + description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.DamienCassou ]; + }; +} diff --git a/pkgs/development/python-modules/woob/no-test-requiring-network.patch b/pkgs/development/python-modules/woob/no-test-requiring-network.patch new file mode 100644 index 000000000000..7095019d0541 --- /dev/null +++ b/pkgs/development/python-modules/woob/no-test-requiring-network.patch @@ -0,0 +1,54 @@ +--- a/woob/browser/browsers.py ++++ b/woob/browser/browsers.py +@@ -930,23 +930,6 @@ + + :class:`NextPage` constructor can take an url or a Request object. + +- >>> from .pages import HTMLPage +- >>> class Page(HTMLPage): +- ... def iter_values(self): +- ... for el in self.doc.xpath('//li'): +- ... yield el.text +- ... for next in self.doc.xpath('//a'): +- ... raise NextPage(next.attrib['href']) +- ... +- >>> class Browser(PagesBrowser): +- ... BASEURL = 'https://woob.tech' +- ... list = URL('/tests/list-(?P\d+).html', Page) +- ... +- >>> b = Browser() +- >>> b.list.go(pagenum=1) # doctest: +ELLIPSIS +- +- >>> list(b.pagination(lambda: b.page.iter_values())) +- ['One', 'Two', 'Three', 'Four'] + """ + while True: + try: +--- a/woob/browser/pages.py ++++ b/woob/browser/pages.py +@@ -49,25 +49,6 @@ + + :class:`NextPage` constructor can take an url or a Request object. + +- >>> class Page(HTMLPage): +- ... @pagination +- ... def iter_values(self): +- ... for el in self.doc.xpath('//li'): +- ... yield el.text +- ... for next in self.doc.xpath('//a'): +- ... raise NextPage(next.attrib['href']) +- ... +- >>> from .browsers import PagesBrowser +- >>> from .url import URL +- >>> class Browser(PagesBrowser): +- ... BASEURL = 'https://woob.tech' +- ... list = URL('/tests/list-(?P\d+).html', Page) +- ... +- >>> b = Browser() +- >>> b.list.go(pagenum=1) # doctest: +ELLIPSIS +- +- >>> list(b.page.iter_values()) +- ['One', 'Two', 'Three', 'Four'] + """ + + @wraps(func) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 70e06433e920..fb8cfb39a5a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8987,6 +8987,8 @@ in { wled = callPackage ../development/python-modules/wled { }; + woob = callPackage ../development/python-modules/woob { }; + word2vec = callPackage ../development/python-modules/word2vec { }; wordcloud = callPackage ../development/python-modules/wordcloud { }; From c7fba6a4726c2e81abac9867bb7368b9c28a1f20 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 13 Apr 2021 14:42:09 +0000 Subject: [PATCH 06/20] xorg.xorgserver: 1.20.10 -> 1.20.11 https://lists.x.org/archives/xorg-announce/2021-April/003081.html https://lists.x.org/archives/xorg-announce/2021-April/003080.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1173fc22370a..36fe0fcb9444 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2692,11 +2692,11 @@ lib.makeScope newScope (self: with self; { }) {}; xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { - name = "xorg-server-1.20.10"; + name = "xorg-server-1.20.11"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2"; - sha256 = "16bwrf0ag41l7jbrllbix8z6avc5yimga7ihvq4ch3a5hb020x4p"; + url = "mirror://xorg/individual/xserver/xorg-server-1.20.11.tar.bz2"; + sha256 = "0jacqgin8kcyy8fyv0lhgb4if8g9hp60rm3ih3s1mgps7xp7jk4i"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 61cfd4df180f..355619d73a0b 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.20.11.tar.bz2 From a3c2706c676742958c928f057c9d580f7675945f Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 10 Mar 2021 12:37:13 +0100 Subject: [PATCH 07/20] python3Packages.ipfshttpclient: 0.4.2.post1 -> 0.7.0, rename from ipfsapi --- .../python-modules/ipfsapi/default.nix | 30 ------- .../python-modules/ipfshttpclient/default.nix | 82 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 83 insertions(+), 31 deletions(-) delete mode 100644 pkgs/development/python-modules/ipfsapi/default.nix create mode 100644 pkgs/development/python-modules/ipfshttpclient/default.nix diff --git a/pkgs/development/python-modules/ipfsapi/default.nix b/pkgs/development/python-modules/ipfsapi/default.nix deleted file mode 100644 index c97eafb6054c..000000000000 --- a/pkgs/development/python-modules/ipfsapi/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, isPy27 -, six -, requests -}: - -buildPythonPackage { - pname = "ipfsapi"; - version = "0.4.2.post1"; - disabled = isPy27; - - src = fetchFromGitHub { - owner = "ipfs"; - repo = "py-ipfs-api"; - rev = "0c485544a114f580c65e2ffbb5782efbf7fd9f61"; - sha256 = "1v7f77cv95yv0v80gisdh71mj7jcq41xcfip6bqm57zfdbsa0xpn"; - }; - - propagatedBuildInputs = [ six requests ]; - - meta = with lib; { - description = "A python client library for the IPFS API"; - license = licenses.mit; - maintainers = with maintainers; [ mguentner ]; - homepage = "https://pypi.python.org/pypi/ipfsapi"; - }; - -} diff --git a/pkgs/development/python-modules/ipfshttpclient/default.nix b/pkgs/development/python-modules/ipfshttpclient/default.nix new file mode 100644 index 000000000000..aec8f1ec1176 --- /dev/null +++ b/pkgs/development/python-modules/ipfshttpclient/default.nix @@ -0,0 +1,82 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, python +, py-multiaddr +, requests +, pytestCheckHook +, pytest-cov +, pytest-dependency +, pytest-localserver +, pytest-mock +, pytest-order +, pytest-cid +, mock +, ipfs +, httpx +, httpcore +}: + +buildPythonPackage rec { + pname = "ipfshttpclient"; + version = "0.7.0"; + format = "flit"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "ipfs-shipyard"; + repo = "py-ipfs-http-client"; + rev = version; + sha256 = "sha256-0lMoZo/9kZUXkaKvD9ZAZDQdGX7eNLzJVszZdlM/3Qs="; + }; + + propagatedBuildInputs = [ + py-multiaddr + requests + ]; + + checkInputs = [ + pytestCheckHook + pytest-cov + pytest-dependency + pytest-localserver + pytest-mock + pytest-order + pytest-cid + mock + ipfs + httpcore + httpx + ]; + + postPatch = '' + # Remove when the package supports the latest IPFS version by default + substituteInPlace ipfshttpclient/client/__init__.py \ + --replace 'VERSION_MAXIMUM = "0.8.0"' \ + 'VERSION_MAXIMUM = "0.9.0"' + + # Use pytest-order instead of pytest-ordering since the latter is unmaintained and broken + substituteInPlace test/run-tests.py \ + --replace 'pytest_ordering' 'pytest_order' + substituteInPlace test/functional/test_miscellaneous.py \ + --replace '@pytest.mark.last' '@pytest.mark.order("last")' + ''; + + checkPhase = '' + runHook preCheck + + ${python.interpreter} -X utf8 test/run-tests.py + + runHook postCheck + ''; + + pythonImportsCheck = [ "ipfshttpclient" ]; + + meta = with lib; { + description = "A python client library for the IPFS API"; + homepage = "https://github.com/ipfs-shipyard/py-ipfs-http-client"; + license = licenses.mit; + maintainers = with maintainers; [ mguentner Luflosi ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 70e06433e920..0feb2e9ddf9a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3397,7 +3397,7 @@ in { ipdbplugin = callPackage ../development/python-modules/ipdbplugin { }; - ipfsapi = callPackage ../development/python-modules/ipfsapi { }; + ipfshttpclient = callPackage ../development/python-modules/ipfshttpclient { }; iptools = callPackage ../development/python-modules/iptools { }; From 9f9ab6fffc3b87d7640d58f849fe1121e9f00fa0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 13 Apr 2021 18:44:35 +0200 Subject: [PATCH 08/20] wpa_supplicant: add patch for CVE-2021-30004 In wpa_supplicant and hostapd 2.9, forging attacks may occur because AlgorithmIdentifier parameters are mishandled in tls/pkcs1.c and tls/x509v3.c. Fixes: CVE-2021-30004 --- pkgs/os-specific/linux/wpa_supplicant/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index f9198cc8ff4b..80eaf04a1149 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -37,6 +37,12 @@ stdenv.mkDerivation rec { url = "https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch"; sha256 = "04cnds7hmbqc44jasabjvrdnh66i5hwvk2h2m5z94pmgbzncyh3z"; }) + # In wpa_supplicant and hostapd 2.9, forging attacks may occur because AlgorithmIdentifier parameters are mishandled in tls/pkcs1.c and tls/x509v3.c. + (fetchpatch { + name = "CVE-2021-30004.patch"; + url = "https://w1.fi/cgit/hostap/patch/?id=a0541334a6394f8237a4393b7372693cd7e96f15"; + sha256 = "1gbhlz41x1ar1hppnb76pqxj6vimiypy7c4kq6h658637s4am3xg"; + }) ]; # TODO: Patch epoll so that the dbus actually responds From 4480a056c93c1197eb4ff8f93d763b041098c4e5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 13 Apr 2021 19:32:22 +0200 Subject: [PATCH 09/20] hostapd: add patch for CVE-2021-30004 In wpa_supplicant and hostapd 2.9, forging attacks may occur because AlgorithmIdentifier parameters are mishandled in tls/pkcs1.c and tls/x509v3.c. Fixes: CVE-2021-30004 --- pkgs/os-specific/linux/hostapd/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 2b018c0267a6..5d4edc4f7e76 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libnl, openssl, sqlite ? null }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libnl, openssl, sqlite ? null }: stdenv.mkDerivation rec { pname = "hostapd"; @@ -43,6 +43,12 @@ stdenv.mkDerivation rec { url = "https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch"; sha256 = "12npqp2skgrj934wwkqicgqksma0fxz09di29n1b5fm5i4njl8d8"; }) + # In wpa_supplicant and hostapd 2.9, forging attacks may occur because AlgorithmIdentifier parameters are mishandled in tls/pkcs1.c and tls/x509v3.c. + (fetchpatch { + name = "CVE-2021-30004.patch"; + url = "https://w1.fi/cgit/hostap/patch/?id=a0541334a6394f8237a4393b7372693cd7e96f15"; + sha256 = "1gbhlz41x1ar1hppnb76pqxj6vimiypy7c4kq6h658637s4am3xg"; + }) ]; outputs = [ "out" "man" ]; From 489433ba48788b304f7055b3448c0bbec4c7114b Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Wed, 14 Apr 2021 00:33:39 +0530 Subject: [PATCH 10/20] google-cloud-sdk: 334.0.0 -> 336.0.0 --- pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 2ff2bf92f89b..f89e02c8593b 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "0csgdmzr9h3vnqn8gxvgg2mnjzackkvrid1i55l2fqcad69h6w1k"; + sha256 = "0fb0bw16idj810si32fxqx1nl057bdsjk3pvkgzpf7j96v2lkw71"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "0gcxldk3c03dipbkj9yzaa4v1s6bf9zlwslvi8dv3s3kbljjd84b"; + sha256 = "0gnnp8whcx6ada8a4xs8kxrbza97zivk57r9qzv0q5arg4xslagr"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "334.0.0"; + version = "336.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); From 8c57f223246d4c63eb20ff4b7543a9a39ae5aaa3 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 13 Apr 2021 20:24:59 +0100 Subject: [PATCH 11/20] deno: 1.8.3 -> 1.9.0 --- pkgs/development/web/deno/default.nix | 6 +++--- pkgs/development/web/deno/librusty_v8.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index cdb34aab45c4..6faba30bf77f 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -15,15 +15,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.8.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QkVDIpJ4VW3DpcwhydDnt68zxVXwkitIiN8blGlqX1g="; + sha256 = "sha256-LrJGwsP+P8zXYwboF5791YuWGVdhcQJLOoBv+VzrYzs="; }; - cargoSha256 = "sha256-pf/4/H3wNORNvAswz8+7B3x5T5MyQgW7HgtDLBhfE/o="; + cargoSha256 = "sha256-JDapls3nRNETri6nZPRjZFlAFVN1Owhp965zf0Rn3ug="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 41c06fbf7ce0..c1dbd0f773a8 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.21.0"; + version = "0.22.1"; shas = { - x86_64-linux = "sha256-oxGCM6jlqafjAfTtFwARxBv/8tiUaD9A2TlLyj/3LlQ="; - aarch64-linux = "sha256-yeDcrxEp3qeE6/NWEc1v7VoHjlgppIOkcHTNVksXNsM="; - x86_64-darwin = "sha256-QqdBa59xPxM8eDRzvPxvv9HFVgp2rt+5jiwIOgsi8JE="; - aarch64-darwin = "sha256-aq2Kjn8QSDMhNg8pEbXkJCHUKmDTNnitq42SDDVyRd4="; + x86_64-linux = "sha256-rHI5qzwmDvlIdjUCZwvl6/s2Oe6d3/V7TJwfP1AFjik="; + aarch64-linux = "sha256-7VhrOkzWayZFTsq0II5uh+TxXaIDSkc0E19ZwT3Hl6c="; + x86_64-darwin = "sha256-zXXL2YqgjFmuDHGReIGWVxfSS3PMND0J0qlHRV/rKs8="; + aarch64-darwin = "sha256-X/CCJn5yWJH2x6lCGAFllrQUj7XLA3TICRP3aiWytjk="; }; } From 54ecd5246d22278efc765297b63bde572f814408 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Apr 2021 21:39:00 +0200 Subject: [PATCH 12/20] python3Packages.pyroute2: add pythonImportsCheck --- pkgs/development/python-modules/pyroute2/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index a1acee1db9a9..00ce008d6cc7 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -1,4 +1,7 @@ -{lib, buildPythonPackage, fetchPypi}: +{ lib +, buildPythonPackage +, fetchPypi +}: buildPythonPackage rec { pname = "pyroute2"; @@ -9,14 +12,16 @@ buildPythonPackage rec { sha256 = "sha256-CKxAytUsC7Lg8gCHUgWZqpH8zgsiHdJukEIzBCiBC8U="; }; - # requires root priviledges + # Requires root privileges, https://github.com/svinota/pyroute2/issues/778 doCheck = false; + pythonImportsCheck = [ "pyroute2" ]; + meta = with lib; { description = "Python Netlink library"; homepage = "https://github.com/svinota/pyroute2"; license = licenses.asl20; - maintainers = [maintainers.mic92]; + maintainers = with maintainers; [ mic92 ]; platforms = platforms.unix; }; } From e019872af81e4013fd518fcacfba74b1de21a50e Mon Sep 17 00:00:00 2001 From: Technical27 <38222826+Technical27@users.noreply.github.com> Date: Tue, 13 Apr 2021 15:44:15 -0400 Subject: [PATCH 13/20] fcitx5-m17n: init at 5.0.4 (#119357) Co-authored-by: Sandro --- .../tools/inputmethods/fcitx5/fcitx5-m17n.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix new file mode 100644 index 000000000000..9e367d70799a --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, pkg-config +, fcitx5 +, m17n_lib +, m17n_db +, gettext +, fmt +}: + +stdenv.mkDerivation rec { + pname = "fcitx5-m17n"; + version = "5.0.4"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = pname; + rev = version; + sha256 = "sha256-yI6Svr1KEdHqAX3qd7t7GvD0EcWg0A2vZpuJw1U9oKQ="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + gettext + ]; + + buildInputs = [ + fcitx5 + m17n_db + m17n_lib + fmt + ]; + + meta = with lib; { + description = "m17n support for Fcitx5"; + homepage = "https://github.com/fcitx/fcitx5-m17n"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ Technical27 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b550b5b55f21..6dd393492c8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4356,6 +4356,8 @@ in fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { }; + fcitx5-m17n = callPackage ../tools/inputmethods/fcitx5/fcitx5-m17n.nix { }; + fcitx5-gtk = callPackage ../tools/inputmethods/fcitx5/fcitx5-gtk.nix { }; fcitx5-rime = callPackage ../tools/inputmethods/fcitx5/fcitx5-rime.nix { }; From 6a6d2df62ae66f87bea632cd7f812392fecdf294 Mon Sep 17 00:00:00 2001 From: Hutzdog Date: Mon, 12 Apr 2021 18:52:23 -0700 Subject: [PATCH 14/20] lbry: init at 0.50.2 --- pkgs/applications/video/lbry/default.nix | 49 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/applications/video/lbry/default.nix diff --git a/pkgs/applications/video/lbry/default.nix b/pkgs/applications/video/lbry/default.nix new file mode 100644 index 000000000000..479616ee3ef5 --- /dev/null +++ b/pkgs/applications/video/lbry/default.nix @@ -0,0 +1,49 @@ +{ lib, fetchurl, appimageTools}: + +let + pname = "lbry-desktop"; + version = "0.50.2"; +in appimageTools.wrapAppImage rec { + name = "${pname}-${version}"; + + # Fetch from GitHub Releases and extract + src = appimageTools.extract { + inherit name; + src = fetchurl { + url = "https://github.com/lbryio/lbry-desktop/releases/download/v${version}/LBRY_${version}.AppImage"; + # Gotten from latest-linux.yml + sha512 = "br6HvVRz+ybmAhmQh3vOC5wgLmOCVrGHDn59ueWk6rFoKOCbm8WdmdadOZvHeN1ld2nlvPzEy+KXMOEfF1LeQg=="; + }; + }; + + # At runtime, Lbry likes to have access to Ffmpeg + extraPkgs = pkgs: with pkgs; [ + ffmpeg + ]; + + # General fixup + extraInstallCommands = '' + # Firstly, rename the executable to lbry for convinence + mv $out/bin/${name} $out/bin/lbry + + # Now, install assets such as the desktop file and icons + install -m 444 -D ${src}/lbry.desktop -t $out/share/applications + substituteInPlace $out/share/applications/lbry.desktop \ + --replace 'AppRun' '$out/bin/lbry' + cp -r ${src}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "A browser and wallet for LBRY, the decentralized, user-controlled content marketplace"; + longDescription = '' + The LBRY app is a graphical browser for the decentralized content marketplace provided by the LBRY protocol. + It is essentially the lbry daemon bundled with a UI using Electron. + ''; + license = licenses.mit; + homepage = "https://lbry.com/"; + downloadPage = "https://lbry.com/get/"; + changelog = "https://github.com/lbryio/lbry-desktop/blob/master/CHANGELOG.md"; + maintainers = with maintainers; [ enderger ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 613b9ffc57ec..53427ebdd883 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24044,6 +24044,8 @@ in lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; mu = null; }; + lbry = callPackage ../applications/video/lbry { }; + lbzip2 = callPackage ../tools/compression/lbzip2 { }; lci = callPackage ../applications/science/logic/lci {}; From 8f7356a9bf996e89ae26c67aa5651c12aa3802b5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Apr 2021 22:17:25 +0200 Subject: [PATCH 15/20] python3Packages.aiodiscover: 1.3.3 -> 1.3.4 --- .../python-modules/aiodiscover/default.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index e724d53bfe75..8a7f72f8b863 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -2,22 +2,23 @@ , async-dns , buildPythonPackage , fetchFromGitHub -, fetchpatch , ifaddr , pyroute2 +, pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "aiodiscover"; - version = "1.3.3"; + version = "1.3.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "186agrjx818vn00d3pqlka5ir48rgpbfyn1cifkn9ylsxg9cz3ph"; + sha256 = "sha256-TmWl5d5HwyqWPUjwtEvc5FzVfxV/K1pekljcMkGN0Ag="; }; propagatedBuildInputs = [ @@ -30,9 +31,21 @@ buildPythonPackage rec { substituteInPlace setup.py --replace '"pytest-runner>=5.2",' "" ''; - # Tests require access to /etc/resolv.conf - # pythonImportsCheck doesn't work as async-dns wants to create its CONFIG_DIR - doCheck = false; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + preBuild = '' + export HOME=$TMPDIR + ''; + + disabledTests = [ + # Tests require access to /etc/resolv.conf + "test_async_discover_hosts" + ]; + + pythonImportsCheck = ["aiodiscover"]; meta = with lib; { description = "Python module to discover hosts via ARP and PTR lookup"; From 4911885737616c49a4044ac77e7d1c5da131a32a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Apr 2021 22:38:41 +0200 Subject: [PATCH 16/20] python3Packages.karton-yaramatcher: init at 1.0.0 --- .../karton-yaramatcher/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/karton-yaramatcher/default.nix diff --git a/pkgs/development/python-modules/karton-yaramatcher/default.nix b/pkgs/development/python-modules/karton-yaramatcher/default.nix new file mode 100644 index 000000000000..afe6f2aaa443 --- /dev/null +++ b/pkgs/development/python-modules/karton-yaramatcher/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, karton-core +, python +, yara-python +}: + +buildPythonPackage rec { + pname = "karton-yaramatcher"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "CERT-Polska"; + repo = pname; + rev = "v${version}"; + sha256 = "093h5hbx2ss4ly523gvf10a5ky3vvin6wipigvhx13y1rdxl6c9n"; + }; + + propagatedBuildInputs = [ + karton-core + yara-python + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "karton-core==4.0.5" "karton-core" \ + --replace "yara-python==4.0.2" "yara-python" \ + ''; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; + + pythonImportsCheck = [ "karton.yaramatcher" ]; + + meta = with lib; { + description = "File and analysis artifacts yara matcher for the Karton framework"; + homepage = "https://github.com/CERT-Polska/karton-yaramatcher"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 70e06433e920..d83a12673b52 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3685,6 +3685,8 @@ in { karton-core = callPackage ../development/python-modules/karton-core { }; + karton-yaramatcher = callPackage ../development/python-modules/karton-yaramatcher { }; + kazoo = callPackage ../development/python-modules/kazoo { }; kconfiglib = callPackage ../development/python-modules/kconfiglib { }; From 1f32dfca662611821fdc18828dbce335f43b3c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 13 Apr 2021 18:41:05 -0300 Subject: [PATCH 17/20] xfce.exo: 4.16.1 -> 4.16.2 --- pkgs/desktops/xfce/core/exo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/desktops/xfce/core/exo/default.nix index d9afdfe0d9cf..962170a1765f 100644 --- a/pkgs/desktops/xfce/core/exo/default.nix +++ b/pkgs/desktops/xfce/core/exo/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "exo"; - version = "4.16.1"; + version = "4.16.2"; - sha256 = "1220mq8gs5s8l0d1p92j6icldzqj6zaisp27ss5jm7hwkkcnms9n"; + sha256 = "0rsp92j4hkr5jrkrj8anzw9fwd96xbxzpzqzqiyjjwdiq7b29l1v"; nativeBuildInputs = [ libxslt From 4636ea80bc31472e32529f59464455bf880082fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 13 Apr 2021 18:48:51 -0300 Subject: [PATCH 18/20] xfce.xfdashboard: 0.9.1 -> 0.9.2 --- pkgs/desktops/xfce/applications/xfdashboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/pkgs/desktops/xfce/applications/xfdashboard/default.nix index 837361669480..bef18e3e505d 100644 --- a/pkgs/desktops/xfce/applications/xfdashboard/default.nix +++ b/pkgs/desktops/xfce/applications/xfdashboard/default.nix @@ -17,11 +17,11 @@ mkXfceDerivation { category = "apps"; pname = "xfdashboard"; - version = "0.9.1"; + version = "0.9.2"; rev-prefix = ""; odd-unstable = false; - sha256 = "14k774wxbk3w0ci2mmm6bhq4i742qahd0j0dr40iwmld55473zgd"; + sha256 = "06pvzhhkr2mimsrzlkpsrzf5fxag4fhabyb3cpmgpyp5hcbgvaj3"; buildInputs = [ clutter From 61a092e6bf3ecceb404b484b25e4802402874cd5 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Wed, 14 Apr 2021 00:38:46 +0200 Subject: [PATCH 19/20] vscode-extensions.hashicorp.terraform: 2.9.1 -> 2.10.0 --- pkgs/misc/vscode-extensions/terraform/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/misc/vscode-extensions/terraform/default.nix index fbfb7c06dc5e..592994c33147 100644 --- a/pkgs/misc/vscode-extensions/terraform/default.nix +++ b/pkgs/misc/vscode-extensions/terraform/default.nix @@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.9.1"; + version = "2.10.0"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; - url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix"; - sha256 = "1i4pzxw57hf2g7x62hfsb588b1lz3zjjh8ny96qqrif2bj2h887z"; + url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix"; + sha256 = "1xhypy4vvrzxj3qwkzpfx8b48hddf72mxmh0hgz7iry6bch6sh5f"; }; patches = [ ./fix-terraform-ls.patch ]; From b94e3aa0f26b1fb6deac5cfe45ffe7115b727d0c Mon Sep 17 00:00:00 2001 From: greizgh Date: Wed, 14 Apr 2021 01:18:51 +0200 Subject: [PATCH 20/20] libsearpc: build python3 package (#119366) --- .../development/libraries/libsearpc/default.nix | 17 ++++++----------- .../libraries/libsearpc/libsearpc.pc.patch | 10 ---------- 2 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 pkgs/development/libraries/libsearpc/libsearpc.pc.patch diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 1ac5cef7c5f6..199ae0b685cf 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -1,4 +1,5 @@ -{lib, stdenv, fetchFromGitHub, automake, autoconf, pkg-config, libtool, python2Packages, glib, jansson}: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3Packages +, glib, jansson }: stdenv.mkDerivation rec { version = "3.2.0"; @@ -11,21 +12,15 @@ stdenv.mkDerivation rec { sha256 = "18i5zvrp6dv6vygxx5nc93mai2p2x786n5lnf5avrin6xiz2j6hd"; }; - patches = [ ./libsearpc.pc.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf libtool python2Packages.python python2Packages.simplejson ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = with python3Packages; [ python simplejson ]; propagatedBuildInputs = [ glib jansson ]; - postPatch = "patchShebangs autogen.sh"; - - preConfigure = "./autogen.sh"; - meta = with lib; { homepage = "https://github.com/haiwen/libsearpc"; - description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System"; + description = "A simple and easy-to-use C language RPC framework based on GObject System"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ greizgh ]; }; } diff --git a/pkgs/development/libraries/libsearpc/libsearpc.pc.patch b/pkgs/development/libraries/libsearpc/libsearpc.pc.patch deleted file mode 100644 index 6f30932ba6db..000000000000 --- a/pkgs/development/libraries/libsearpc/libsearpc.pc.patch +++ /dev/null @@ -1,10 +0,0 @@ -From: Aaron Lindsay - ---- a/libsearpc.pc.in 2013-01-10 01:35:24.000000000 -0500 -+++ b/libsearpc.pc.in 2013-01-19 11:31:50.479301798 -0500 -@@ -1,4 +1,4 @@ --prefix=(DESTDIR)@prefix@ -+prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@