From 9094beb05452d3bbfc2bdcfc91ae8a0064454ec0 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 5 Jun 2022 13:19:49 +0300 Subject: [PATCH 1/7] python3.pkgs.manticore: mark as broken only once Fix ofborg's evaluation on the release-22.05 branch. It's hard to blame anyone for causing this evaluation error. Both commits 43072cd01766eb7270f121a5c6c90f4d74c2ea48 and c5b2704fcd097d9dca601eccb8888a2c32c38706 created the `meta.broken` attribute. The diff of both commits doesn't indicate either had the other `broken` attribute written. --- pkgs/development/python-modules/manticore/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/manticore/default.nix b/pkgs/development/python-modules/manticore/default.nix index 1fe290d47e9d..c645a070e4b1 100644 --- a/pkgs/development/python-modules/manticore/default.nix +++ b/pkgs/development/python-modules/manticore/default.nix @@ -132,7 +132,5 @@ buildPythonPackage rec { license = licenses.agpl3Only; platforms = platforms.unix; maintainers = with maintainers; [ arturcygan ]; - # m.c.manticore:WARNING: Manticore is only supported on Linux. Proceed at your own risk! - broken = stdenv.isDarwin; }; } From 34fb2fe9d2ae1a4940aa16a435243d62836f64d5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 6 Jun 2022 20:37:37 +0200 Subject: [PATCH 2/7] [Backport release-22.05] cfscrape: init at 2.1.1 (#176583) Co-authored-by: WeebSorceress --- maintainers/maintainer-list.nix | 11 ++++++++ .../python-modules/cfscrape/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/cfscrape/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 65d8d81cca74..40e10be70cce 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13559,6 +13559,17 @@ email = "kirill.wedens@gmail.com"; name = "wedens"; }; + WeebSorceress = { + name = "WeebSorceress"; + email = "hello@weebsorceress.anonaddy.me"; + matrix = "@weebsorceress:matrix.org"; + github = "WeebSorceress"; + githubId = 106774777; + keys = [{ + longkeyid = "rsa4096/0x7F57344317F0FA43"; + fingerprint = "659A 9BC3 F904 EC24 1461 2EFE 7F57 3443 17F0 FA43"; + }]; + }; wegank = { name = "Weijia Wang"; email = "contact@weijia.wang"; diff --git a/pkgs/development/python-modules/cfscrape/default.nix b/pkgs/development/python-modules/cfscrape/default.nix new file mode 100644 index 000000000000..3fd98b7e1e2a --- /dev/null +++ b/pkgs/development/python-modules/cfscrape/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "cfscrape"; + version = "2.1.1"; + src = fetchFromGitHub ({ + owner = "Anorov"; + repo = "cloudflare-scrape"; + rev = "9692fe7ff3c17b76ddf0f4d50d3dba7d1791c9c6"; + sha256 = "sha256-uO8lBZonjk+mlFYoNSaz+GIN/W9yf8VL9OQ7MKfsMgI="; + }); + + propagatedBuildInputs = [ requests ]; + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/Anorov/cloudflare-scrape"; + description = "A Python module to bypass Cloudflare's anti-bot page"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ WeebSorceress ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2dec07bc39ee..18ddf52c87c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1587,6 +1587,8 @@ in { cfn-lint = callPackage ../development/python-modules/cfn-lint { }; + cfscrape = callPackage ../development/python-modules/cfscrape { }; + cftime = callPackage ../development/python-modules/cftime { }; cgen = callPackage ../development/python-modules/cgen { }; From f05e7d39a48db1cd5bcdc7775e171779d7b4a8a6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 6 Jun 2022 20:37:50 +0200 Subject: [PATCH 3/7] [Backport release-22.05] pySmartDL: init at 1.3.4 (#176579) Co-authored-by: WeebSorceress --- .../python-modules/pySmartDL/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/pySmartDL/default.nix diff --git a/pkgs/development/python-modules/pySmartDL/default.nix b/pkgs/development/python-modules/pySmartDL/default.nix new file mode 100644 index 000000000000..5c43fb756ce8 --- /dev/null +++ b/pkgs/development/python-modules/pySmartDL/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pySmartDL"; + version = "1.3.4"; + src = fetchFromGitHub ({ + owner = "iTaybb"; + repo = pname; + rev = "b93df794e1e60017c42d9520ac097b6fd38c2e8b"; + sha256 = "sha256-Etyv3xCB1cGozWDsskygwcTHJfC+V5hvqBNQAF8SIMM="; + }); + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/iTaybb/pySmartDL"; + description = "A Smart Download Manager for Python"; + license = licenses.unlicense; + platforms = platforms.linux; + maintainers = with maintainers; [ WeebSorceress ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 18ddf52c87c6..0010a67d1a5d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7985,6 +7985,8 @@ in { pysmartapp = callPackage ../development/python-modules/pysmartapp { }; + pySmartDL = callPackage ../development/python-modules/pySmartDL { }; + pysmartthings = callPackage ../development/python-modules/pysmartthings { }; pysmb = callPackage ../development/python-modules/pysmb { }; From 83cdcb59dea56cb128a8a54858be895ccf7fe9c3 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 6 Jun 2022 18:26:38 +0100 Subject: [PATCH 4/7] htop-vim: unstable-2021-10-11 -> unstable-2022-05-24 (cherry picked from commit 475b010143aa77a584ac51bc4934860cf22d0eb6) --- pkgs/tools/system/htop/htop-vim.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/htop/htop-vim.nix b/pkgs/tools/system/htop/htop-vim.nix index 05af41ae0ce4..c2ec5b9ddffb 100644 --- a/pkgs/tools/system/htop/htop-vim.nix +++ b/pkgs/tools/system/htop/htop-vim.nix @@ -2,20 +2,19 @@ htop.overrideAttrs (oldAttrs: rec { pname = "htop-vim"; - version = "unstable-2021-10-11"; + version = "unstable-2022-05-24"; src = fetchFromGitHub { owner = "KoffeinFlummi"; repo = pname; - rev = "ba6fd3891e9af60b41bd092524cc05f2469fec4b"; - sha256 = "sha256-G83+5GgEz41begDkdK8zNx48UleufFCJ9pOQ9nbtFNs="; + rev = "830ef7144940875d9d9716e33aff8651d164026e"; + sha256 = "sha256-ojStkpWvhb+W3dWyRev0VwjtCVL/I9L8FhtXcQ+ODLA="; }; meta = with lib; { + inherit (htop.meta) platforms license; description = "An interactive process viewer for Linux, with vim-style keybindings"; homepage = "https://github.com/KoffeinFlummi/htop-vim"; - license = licenses.gpl2Only; - platforms = platforms.all; maintainers = with maintainers; [ thiagokokada ]; mainProgram = "htop"; }; From c703258873bae254afaf7522e150d77493ea367a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 29 May 2022 10:48:29 -0300 Subject: [PATCH 5/7] jwm: 2.4.1 -> 2.4.2 (cherry picked from commit 889c8592d52bdc90f9363f2d89b2388b618fe3cb) --- pkgs/applications/window-managers/jwm/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 8a9b72265b99..d4271f4f6e39 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gettext +{ lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf, gettext , which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp -, libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }: +, libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig, pango }: stdenv.mkDerivation rec { pname = "jwm"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; rev = "v${version}"; - sha256 = "sha256-7CEL2ddlABM7SYjMVUs3pu0O+2cVsz04slsdUIbgZuM="; + sha256 = "sha256-rvuz2Pmon3XBqRMgDwZNrQlWDyLNSK30JPmmQTlN+Rs="; }; - nativeBuildInputs = [ pkg-config gettext which autoreconfHook ]; + nativeBuildInputs = [ pkg-config gettext which automake autoconf ]; buildInputs = [ libX11 @@ -32,8 +32,11 @@ stdenv.mkDerivation rec { librsvg freetype fontconfig + pango ]; + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + enableParallelBuilding = true; meta = { From 83c1b0533219834d30179529620bf3790fb3e884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 29 May 2022 11:33:09 -0300 Subject: [PATCH 6/7] jwm: add update script (cherry picked from commit ea4692000b1dbb96a6d4ccac296a5c53c5f9bb67) --- pkgs/applications/window-managers/jwm/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index d4271f4f6e39..3f3cfd045bb6 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf, gettext , which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp -, libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig, pango }: +, libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig, pango +, gitUpdater }: stdenv.mkDerivation rec { pname = "jwm"; @@ -39,6 +40,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = gitUpdater { + inherit pname version; + rev-prefix = "v"; + }; + meta = { homepage = "http://joewing.net/projects/jwm/"; description = "Joe's Window Manager is a light-weight X11 window manager"; From 33052fc8e083cadfa30610808effe2102ef53dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 29 May 2022 11:36:50 -0300 Subject: [PATCH 7/7] jwm: reformat (cherry picked from commit 02aa3bff8c65e7f42326c4a7977708764208c5f1) --- .../window-managers/jwm/default.nix | 59 ++++++++++++++----- 1 file changed, 44 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 3f3cfd045bb6..49894bd0daa2 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,7 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf, gettext -, which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp -, libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig, pango -, gitUpdater }: +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, expat +, fontconfig +, freetype +, gettext +, libX11 +, libXau +, libXdmcp +, libXext +, libXft +, libXinerama +, libXmu +, libXpm +, libjpeg +, libpng +, librsvg +, pango +, pkg-config +, which +, xorg +, xorgproto +, gitUpdater +}: stdenv.mkDerivation rec { pname = "jwm"; @@ -14,26 +37,32 @@ stdenv.mkDerivation rec { sha256 = "sha256-rvuz2Pmon3XBqRMgDwZNrQlWDyLNSK30JPmmQTlN+Rs="; }; - nativeBuildInputs = [ pkg-config gettext which automake autoconf ]; + nativeBuildInputs = [ + autoconf + automake + gettext + pkg-config + which + ]; buildInputs = [ + expat + fontconfig + freetype libX11 - libXext - libXinerama - libXpm - libXft - xorg.libXrender libXau libXdmcp + libXext + libXft + libXinerama libXmu - libpng + libXpm libjpeg - expat - xorgproto + libpng librsvg - freetype - fontconfig pango + xorg.libXrender + xorgproto ]; preConfigure = "NOCONFIGURE=1 ./autogen.sh";