From 0721ce3ff1caa7c3d8ed7e725450545e303aa98f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Wed, 1 Sep 2021 16:35:33 +0200 Subject: [PATCH 01/20] i3status-rust: install examples --- pkgs/applications/window-managers/i3/status-rust.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 541a205361e4..edb482ad15f0 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' mkdir -p $out/share - cp -R files/* $out/share + cp -R examples files/* $out/share ''; postFixup = '' From 06dbc404f02dea00871e954c10ec2eac1cbea6a8 Mon Sep 17 00:00:00 2001 From: staccato Date: Mon, 30 Aug 2021 18:35:35 +0100 Subject: [PATCH 02/20] rstcheck: init at 3.3.1 --- .../python-modules/rstcheck/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/rstcheck/default.nix diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix new file mode 100644 index 000000000000..b1da54a2cb1e --- /dev/null +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildPythonPackage, docutils }: + +buildPythonPackage rec { + pname = "rstcheck"; + version = "v3.3.1"; + + src = fetchFromGitHub { + owner = "myint"; + repo = pname; + rev = version; + sha256 = "sha256-4AhENuT+LtUMCi+aaI/rKa2gHti8sKGLdVGjdRithXI="; + }; + + pythonImportsCheck = [ "rstcheck" ]; + propagatedBuildInputs = [ docutils ]; + + meta = with lib; { + description = "Checks syntax of reStructuredText and code blocks nested within it"; + homepage = "https://github.com/myint/rstcheck"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ef3b52af0a4..40eafe11c90c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7831,6 +7831,8 @@ in { rst2ansi = callPackage ../development/python-modules/rst2ansi { }; + rstcheck = callPackage ../development/python-modules/rstcheck { }; + rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; rtoml = callPackage ../development/python-modules/rtoml { }; From e02b80996920d0bdf94813cd1da5cb258cb04513 Mon Sep 17 00:00:00 2001 From: staccato Date: Thu, 2 Sep 2021 10:29:48 +0100 Subject: [PATCH 03/20] maintainers: add staccato --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/development/python-modules/rstcheck/default.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 43968e4d80d8..c3f9fd88fe9d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10250,6 +10250,12 @@ githubId = 8668915; name = "Stephane Schitter"; }; + staccato = { + name = "staccato"; + email = "moveq@riseup.net"; + github = "staccato"; + githubId = 86573128; + }; steell = { email = "steve@steellworks.com"; github = "Steell"; diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index b1da54a2cb1e..d109a6cce747 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -18,5 +18,6 @@ buildPythonPackage rec { description = "Checks syntax of reStructuredText and code blocks nested within it"; homepage = "https://github.com/myint/rstcheck"; license = licenses.mit; + maintainers = with maintainers; [ staccato ]; }; } From de8c9e02be99ce7ad2651c11cf43d0a7be8296d1 Mon Sep 17 00:00:00 2001 From: Yureka Date: Thu, 2 Sep 2021 17:18:47 +0200 Subject: [PATCH 04/20] nginxModules: recurse into attrs --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 721b3ddeb353..391520f7a904 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20076,7 +20076,7 @@ with pkgs; modules = [ nginxModules.dav nginxModules.moreheaders ]; }; - nginxModules = callPackage ../servers/http/nginx/modules.nix { }; + nginxModules = recurseIntoAttrs (callPackage ../servers/http/nginx/modules.nix { }); # We should move to dynmaic modules and create a nginxFull package with all modules nginxShibboleth = nginxStable.override { From 2d9bf0131075011006fa0ed5e29c27d4f1db39d0 Mon Sep 17 00:00:00 2001 From: Benoit de Chezelles Date: Thu, 2 Sep 2021 22:06:13 +0200 Subject: [PATCH 05/20] rofi: 1.6.1 -> 1.7.0 And add myself as a maintainer --- maintainers/maintainer-list.nix | 6 ++ .../from_md/release-notes/rl-2111.section.xml | 10 ++++ .../manual/release-notes/rl-2111.section.md | 2 + pkgs/applications/misc/rofi/default.nix | 55 +++++++++++++++---- 4 files changed, 62 insertions(+), 11 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0bcaf2e4367b..3a309c80a6e7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1318,6 +1318,12 @@ githubId = 7346933; name = "betaboon"; }; + bew = { + email = "benoit.dechezelles@gmail.com"; + github = "bew"; + githubId = 9730330; + name = "Benoit de Chezelles"; + }; bfortz = { email = "bernard.fortz@gmail.com"; github = "bfortz"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 3c7f9a274b3d..3d2e8819d445 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1104,6 +1104,16 @@ Superuser created successfully. make the apps fit better visually. + + + rofi has been updated from + 1.6.1 to 1.7.0, one important + thing is the removal of the old xresources based configuration + setup. Read more + in + rofi’s changelog. + + diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index c5a4b5bd98c0..25f89d692cc3 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -316,3 +316,5 @@ To be able to access the web UI this port needs to be opened in the firewall. - `lib.formats.yaml`'s `generate` will not generate JSON anymore, but instead use more of the YAML-specific syntax. - GNOME desktop environment now enables `QGnomePlatform` as the Qt platform theme, which should avoid crashes when opening file chooser dialogs in Qt apps by using XDG desktop portal. Additionally, it will make the apps fit better visually. + +- `rofi` has been updated from '1.6.1' to '1.7.0', one important thing is the removal of the old xresources based configuration setup. Read more [in rofi's changelog](https://github.com/davatorium/rofi/blob/cb12e6fc058f4a0f4f/Changelog#L1). diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index d47d1fe26a61..12daea00cad3 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,16 +1,35 @@ -{ stdenv, lib, fetchurl -, autoreconfHook, pkg-config, libxkbcommon, pango, which, git -, cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification -, bison, flex, librsvg, check +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, pkg-config +, libxkbcommon +, pango +, which +, git +, cairo +, libxcb +, xcbutil +, xcbutilwm +, xcbutilxrm +, xcb-util-cursor +, libstartup_notification +, bison +, flex +, librsvg +, check }: stdenv.mkDerivation rec { pname = "rofi-unwrapped"; - version = "1.6.1"; + version = "1.7.0"; - src = fetchurl { - url = "https://github.com/davatorium/rofi/releases/download/${version}/rofi-${version}.tar.gz"; - sha256 = "04glljqbf9ckkc6x6fv4x1gqmy468n1agya0kd8rxdvz24wzf7cd"; + src = fetchFromGitHub { + owner = "davatorium"; + repo = "rofi"; + rev = version; + fetchSubmodules = true; + sha256 = "03wdy56b3g8p2czb0qydrddyyhj3x037pirnhyqr5qbfczb9a63v"; }; preConfigure = '' @@ -20,8 +39,22 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check - libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which + buildInputs = [ + libxkbcommon + pango + cairo + git + bison + flex + librsvg + check + libstartup_notification + libxcb + xcbutil + xcbutilwm + xcbutilxrm + xcb-util-cursor + which ]; doCheck = false; @@ -30,7 +63,7 @@ stdenv.mkDerivation rec { description = "Window switcher, run dialog and dmenu replacement"; homepage = "https://github.com/davatorium/rofi"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ bew ]; platforms = with platforms; linux; }; } From cd2ee8bc2a68261d2dadb7a9e03ebb59a96a4923 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Fri, 3 Sep 2021 00:41:49 +0300 Subject: [PATCH 06/20] hugo: 0.87.0 -> 0.88.0 --- pkgs/applications/misc/hugo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 7aa844098e3f..7b3f6122a62b 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.87.0"; + version = "0.88.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2I1PDxbqtaOOlVbr7zhuawaFrFWM/PYt5QJm3N74Noc="; + sha256 = "sha256-6dJ8H9oJwIW7rY2NrYVKuWDjwrFc9C30Vb0i20+opM0="; }; - vendorSha256 = "sha256-0pkQ+VcmK2XLaQ2XJHh5/QftSdud6Eo1nlBK+L92xKU="; + vendorSha256 = "sha256-VX+oIz5wAyEQ4nky3kXmJZbMF0MvfAKdEAMLnS0hXc8="; doCheck = false; From 14d281d6901a9e150ad40cb324faea2dad25fb30 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Sep 2021 23:52:37 +0200 Subject: [PATCH 07/20] python3Packages.aiokafka: 0.7.1 -> 0.7.2 --- pkgs/development/python-modules/aiokafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix index 61ff78a3428e..c853b1d25a35 100644 --- a/pkgs/development/python-modules/aiokafka/default.nix +++ b/pkgs/development/python-modules/aiokafka/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aiokafka"; - version = "0.7.1"; + version = "0.7.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D89ppIUliJJMDuCySrZUyN6Rlm01gFskz6ayHmqploc="; + sha256 = "sha256-D+91k4zVg28qPbWIrvyXi6WtDs1jeJt9jFGsrSBA3cs="; }; nativeBuildInputs = [ From e4c99a0008367de4ca5ba0c46a5f5464f3e13bc5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Sep 2021 08:27:42 +0200 Subject: [PATCH 08/20] python3Packages.dpath: 2.0.1 -> 2.0.2 --- .../python-modules/dpath/default.nix | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index 9db726a12a19..8756557e64ca 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -1,24 +1,38 @@ -{ lib, fetchPypi, buildPythonPackage, isPy27 -, mock, pytestCheckHook, nose, hypothesis +{ lib +, buildPythonPackage +, fetchPypi +, hypothesis +, isPy27 +, mock +, nose +, pytestCheckHook }: buildPythonPackage rec { pname = "dpath"; - version = "2.0.1"; + version = "2.0.2"; + disabled = isPy27; # uses python3 imports src = fetchPypi { inherit pname version; - sha256 = "bea06b5f4ff620a28dfc9848cf4d6b2bfeed34238edeb8ebe815c433b54eb1fa"; + sha256 = "sha256-BA2+ShAeG2sbZenaJYU08PCwrgCjsf0tWS/oV5/4N64="; }; # use pytest as nosetests hangs - checkInputs = [ mock nose pytestCheckHook hypothesis ]; + checkInputs = [ + hypothesis + mock + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ "dpath" ]; meta = with lib; { + description = "Python library for accessing and searching dictionaries via /slashed/paths ala xpath"; homepage = "https://github.com/akesterson/dpath-python"; - license = [ licenses.mit ]; - description = "A python library for accessing and searching dictionaries via /slashed/paths ala xpath"; - maintainers = [ maintainers.mmlb ]; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ mmlb ]; }; } From 6781cfad4ff0c4005a6a9b8d84c3d86b7b60f172 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Sep 2021 08:33:42 +0200 Subject: [PATCH 09/20] python3Packages.lupa: 1.9 -> 1.10 --- pkgs/development/python-modules/lupa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lupa/default.nix b/pkgs/development/python-modules/lupa/default.nix index e50404e50472..681ef649d8fb 100644 --- a/pkgs/development/python-modules/lupa/default.nix +++ b/pkgs/development/python-modules/lupa/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "lupa"; - version = "1.9"; + version = "1.10"; src = fetchPypi { inherit pname version; - sha256 = "13ifv0nxbf70xg69sp49j484m8cnid7rgh8f94pgfb50dj01vqd3"; + sha256 = "sha256-4lEbJ/OB9v22bvQNzFGCFQOBl0MbJBk1Z438PVEXgjE="; }; nativeBuildInputs = [ cython ]; From a9aae5868d837f09a71acd0b64f00d8ddb623843 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Sep 2021 09:20:14 +0200 Subject: [PATCH 10/20] python3Packages.fakeredis: 1.5.2 -> 1.6.0 --- pkgs/development/python-modules/fakeredis/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index bd4c85a3bb65..2e0e5c65d06b 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.5.2"; + version = "1.6.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "18fc1808d2ce72169d3f11acdb524a00ef96bd29970c6d34cfeb2edb3fc0c020"; + sha256 = "sha256-Ecz8l2nXGNN+RbOC5kproCWGtiKvoDcaa9hXZtciVfM="; }; propagatedBuildInputs = [ @@ -40,6 +40,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # Missing support for later pytest-asyncio, https://github.com/jamesls/fakeredis/issues/307 + "test/test_aioredis1.py" + ]; + pythonImportsCheck = [ "fakeredis" ]; meta = with lib; { From b20e6dc83ce51632d4a09f0ab8a114c03f2d88eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Sep 2021 09:35:02 +0200 Subject: [PATCH 11/20] python3Packages.xdis: 5.0.10 -> 5.0.11 --- pkgs/development/python-modules/xdis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index aec8b13a122c..81b8e146d9bb 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "xdis"; - version = "5.0.10"; + version = "5.0.11"; disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = version; - sha256 = "sha256-/3qyMgliua7W4Va1HdRbHyiR/eBQzHK+GrZVAMvMhLA="; + sha256 = "sha256-KTPu0+bERLRCVESqJgBPtcftlniWl2+C9GDcf84ssiA="; }; checkInputs = [ pytest ]; From fbb4917115ce1e141a75ac257ea9234fc3b95aa2 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 3 Sep 2021 10:24:14 +0200 Subject: [PATCH 12/20] domoticz: 2020.2 -> 2021.1 Fix package build. --- pkgs/servers/domoticz/default.nix | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/pkgs/servers/domoticz/default.nix b/pkgs/servers/domoticz/default.nix index a514cb1d86d0..0208e27a276e 100644 --- a/pkgs/servers/domoticz/default.nix +++ b/pkgs/servers/domoticz/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, - fetchzip, + fetchFromGitHub, makeWrapper, cmake, python3, @@ -17,29 +17,17 @@ cereal }: -let - version = "2020.2"; - minizip = "f5282643091dc1b33546bb8d8b3c23d78fdba231"; - - domoticz-src = fetchzip { - url = "https://github.com/domoticz/domoticz/archive/${version}.tar.gz"; - sha256 = "1b4pkw9qp7f5r995vm4xdnpbwi9vxjyzbnk63bmy1xkvbhshm0g3"; - }; - - minizip-src = fetchzip { - url = "https://github.com/domoticz/minizip/archive/${minizip}.tar.gz"; - sha256 = "1vddrzm4pwl14bms91fs3mbqqjhcxrmpx9a68b6nfbs20xmpnsny"; - }; -in stdenv.mkDerivation rec { pname = "domoticz"; - inherit version; + version = "2021.1"; - src = domoticz-src; - - postUnpack = '' - cp -r ${minizip-src}/* $sourceRoot/extern/minizip - ''; + src = fetchFromGitHub { + owner = "domoticz"; + repo = pname; + rev = version; + sha256 = "03s1fx2ilhiq47p99c6iln1fi0rhdcxxsrv1zaww7f7bc744vzbk"; + fetchSubmodules = true; + }; buildInputs = [ openssl From 12571055cfb2fb32b096d786b9766a76e9f7e93f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Sep 2021 21:18:14 +0200 Subject: [PATCH 13/20] gotestwaf: init at 0.3.1 --- pkgs/tools/security/gotestwaf/default.nix | 30 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/security/gotestwaf/default.nix diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix new file mode 100644 index 000000000000..7783cbf4688f --- /dev/null +++ b/pkgs/tools/security/gotestwaf/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gotestwaf"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "wallarm"; + repo = pname; + rev = "v${version}"; + sha256 = "0c627bxx0mlxhc1fsd2k3x1lm5855pl215m88la662d70559z6k8"; + }; + + vendorSha256 = null; + + postFixup = '' + # Rename binary + mv $out/bin/cmd $out/bin/${pname} + ''; + + meta = with lib; { + description = "Tool for API and OWASP attack simulation"; + homepage = "https://github.com/wallarm/gotestwaf"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd2f731315d5..5edee9101a01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31528,6 +31528,8 @@ with pkgs; gobuster = callPackage ../tools/security/gobuster { }; + gotestwaf = callPackage ../tools/security/gotestwaf { }; + guetzli = callPackage ../applications/graphics/guetzli { }; gummi = callPackage ../applications/misc/gummi { }; From e3e971fc75054c387e708d23e57d21fbbdc1bbbb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Sep 2021 22:46:02 +0200 Subject: [PATCH 14/20] metabigor: init at 1.9 --- pkgs/tools/security/metabigor/default.nix | 28 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/security/metabigor/default.nix diff --git a/pkgs/tools/security/metabigor/default.nix b/pkgs/tools/security/metabigor/default.nix new file mode 100644 index 000000000000..b511690192c6 --- /dev/null +++ b/pkgs/tools/security/metabigor/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "metabigor"; + version = "1.9"; + + src = fetchFromGitHub { + owner = "j3ssie"; + repo = pname; + rev = "v${version}"; + sha256 = "0gjqjz35m9hj4dpch9akkjs895qrp8fwhcsn474lz6z2q6sb65pr"; + }; + + vendorSha256 = "071s3vlz0maz1597l8y899758g24vh58s4kam4q2mxkzfynzs0cr"; + + # Disabled for now as there are some failures ("undefined:") + doCheck = false; + + meta = with lib; { + description = "Tool to perform OSINT tasks"; + homepage = "https://github.com/j3ssie/metabigor"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd2f731315d5..7b3322415bf7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7271,6 +7271,8 @@ with pkgs; mscgen = callPackage ../tools/graphics/mscgen { }; + metabigor = callPackage ../tools/security/metabigor { }; + metasploit = callPackage ../tools/security/metasploit { }; ms-sys = callPackage ../tools/misc/ms-sys { }; From dc2ad49441526afbbe5942878e9d1fa372f793ad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Sep 2021 14:25:49 +0200 Subject: [PATCH 15/20] python3Packages.anyascii: 0.2.0 -> 0.3.0 --- pkgs/development/python-modules/anyascii/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anyascii/default.nix b/pkgs/development/python-modules/anyascii/default.nix index 8e8b1c920733..b03b59d339ed 100644 --- a/pkgs/development/python-modules/anyascii/default.nix +++ b/pkgs/development/python-modules/anyascii/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "anyascii"; - version = "0.2.0"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; - sha256 = "1b6jdd9nx15py0jqjdn154m6m491517sqlk57bbyj3x4xzywadkh"; + sha256 = "sha256-JPJ0Mftkxsk6MxJftm+MugB6UmK8H6q+r+2l9LtwtZM="; }; checkInputs = [ From d68ca99316080e6d17a1851752b30ebb22f87395 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Fri, 3 Sep 2021 12:22:23 -0600 Subject: [PATCH 16/20] vscode-extensions.viktorqvarfordt.vscode-pitch-black-theme: init at 1.2.4 --- pkgs/misc/vscode-extensions/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 84dc60093d60..c65307e50644 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1400,6 +1400,19 @@ let vadimcn.vscode-lldb = callPackage ./vscode-lldb { }; + viktorqvarfordt.vscode-pitch-black-theme = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-pitch-black-theme"; + publisher = "ViktorQvarfordt"; + version = "1.2.4"; + sha256 = "sha256-HTXToZv0WWFjuQiofEJuaZNSDTmCUcZ0B3KOn+CVALw="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + vincaslt.highlight-matching-tag = buildVscodeMarketplaceExtension { mktplcRef = { name = "highlight-matching-tag"; From 7c0b350d943312fffa10090b5884a2bf5e9d3902 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Sep 2021 11:07:54 +0200 Subject: [PATCH 17/20] gitleaks: 7.5.0 -> 7.6.0 --- pkgs/tools/security/gitleaks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 13c44c49c61e..b8878cbbb873 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gitleaks"; - version = "7.5.0"; + version = "7.6.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s7EOCoGciGT5+Fose9BffsHHE/SsSMmNoWGmeAv6Agk="; + sha256 = "sha256-XRpbbtQiF9EnGMICjyXXm2XjuR0jGC7UiY+UHIAMODM="; }; - vendorSha256 = "sha256-Cc4DJPpOMHxDcH22S7znYo7QHNRXv8jOJhznu09kaE4="; + vendorSha256 = "sha256-86PspExE+T/IuCvpf6LAkWcCRlHPqP5VUbHAckEzALc="; ldflags = [ "-s" "-w" "-X github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}" From 4ebe496bad646a9e99f79250f885d7144fe39230 Mon Sep 17 00:00:00 2001 From: Las Safin Date: Thu, 2 Sep 2021 14:14:06 +0000 Subject: [PATCH 18/20] trellis: 2021.07.06 -> 2021-09-01 I also cleaned up some unnecessary parts. --- .../embedded/fpga/trellis/default.nix | 38 ++++++++----------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/pkgs/development/embedded/fpga/trellis/default.nix b/pkgs/development/embedded/fpga/trellis/default.nix index 4d14b6a78200..4d3859a77df8 100644 --- a/pkgs/development/embedded/fpga/trellis/default.nix +++ b/pkgs/development/embedded/fpga/trellis/default.nix @@ -1,30 +1,27 @@ -{ lib, stdenv, fetchFromGitHub -, python3, boost -, cmake -}: - -stdenv.mkDerivation rec { - pname = "trellis"; - version = "2021.07.06"; +{ lib, stdenv, fetchFromGitHub, python3, boost, cmake }: +let + rev = "03e0070f263fbe31c247de61d259544722786210"; # git describe --tags - realVersion = with lib; with builtins; - "1.0-482-g${substring 0 7 (elemAt srcs 0).rev}"; + realVersion = "1.0-532-g${builtins.substring 0 7 rev}"; +in stdenv.mkDerivation rec { + pname = "trellis"; + version = "2021-09-01"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "prjtrellis"; - rev = "dff1cbcb1bd30de7e96f8a059f2e19be1bb2e44d"; - sha256 = "1gbrka9gqn124shx448aivbgywyp30zyjwfazr7v49lhrl7d46lb"; + inherit rev; + sha256 = "joQMsjVj8d3M3IaqOkfVQ1I5qPDM8HHJiye+Ak8f3dg="; name = "trellis"; }) (fetchFromGitHub { owner = "YosysHQ"; repo = "prjtrellis-db"; - rev = "0ee729d20eaf9f1e0f1d657bc6452e3ffe6a0d63"; - sha256 = "0069c98bb4wilxz21snwc39yy0rm7ffma179djyz57d99p0vcfkq"; + rev = "fdf4bf275a7402654bc643db537173e2fbc86103"; + sha256 = "eDq2wU2pnfK9bOkEVZ07NQPv02Dc6iB+p5GTtVBiyQA="; name = "trellis-database"; }) ]; @@ -34,14 +31,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ]; cmakeFlags = [ "-DCURRENT_GIT_VERSION=${realVersion}" - # TODO: should this be in stdenv instead? - "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" ]; - preConfigure = with builtins; '' - rmdir database && ln -sfv ${elemAt srcs 1} ./database + preConfigure = '' + rmdir database && ln -sfv ${builtins.elemAt srcs 1} ./database - source environment.sh cd libtrellis ''; @@ -53,9 +47,9 @@ stdenv.mkDerivation rec { to provide sufficient information to develop a free and open Verilog to bitstream toolchain for these devices. ''; - homepage = "https://github.com/SymbiFlow/prjtrellis"; - license = lib.licenses.isc; + homepage = "https://github.com/YosysHQ/prjtrellis"; + license = licenses.isc; maintainers = with maintainers; [ q3k thoughtpolice emily ]; - platforms = lib.platforms.all; + platforms = platforms.all; }; } From dd63f999bd90c678d8ccf1faf3b1ddb3abf3a157 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Sep 2021 16:38:24 +0200 Subject: [PATCH 19/20] treewide: remove dummy file --- pkgs/development/python-modules/{} | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 pkgs/development/python-modules/{} diff --git a/pkgs/development/python-modules/{} b/pkgs/development/python-modules/{} deleted file mode 100644 index e69de29bb2d1..000000000000 From 5e6a41c43c5153313612197798c9a673ae4a32ab Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sat, 4 Sep 2021 20:24:32 +0530 Subject: [PATCH 20/20] weechat: 3.2 -> 3.2.1 https://github.com/weechat/weechat/releases/tag/v3.2.1 --- pkgs/applications/networking/irc/weechat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 69fca696d4db..e22ad0b774e6 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -28,14 +28,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.2"; + version = "3.2.1"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0pck4lczkk52mgwa1n0habp1xqi9xsgsh5q6bbsjmdbandvy5vc8"; + sha256 = "sha256-gtFskJoJLw7cqLao46LRUcZobOtzgwUOiKf7I4OiJAQ="; }; patches = [