From bac0d3b001a693fabaf89e24761ae47ada371c52 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 15 May 2022 15:12:02 +0200 Subject: [PATCH 01/27] dotnetPackages.SharpZipLib: 0.86.0 -> 1.3.3 Fixes CVE-2021-32840 --- pkgs/top-level/dotnet-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 10188cee9148..732fb66731ef 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -53,8 +53,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { SharpZipLib = fetchNuGet { pname = "SharpZipLib"; - version = "0.86.0"; - sha256 = "01w2038gckfnq31pncrlgm7d0c939pwr1x4jj5450vcqpd4c41jr"; + version = "1.3.3"; + sha256 = "sha256-HWEQTKh9Ktwg/zIl079dAiH+ob2ShWFAqLgG6XgIMr4="; outputFiles = [ "lib/*" ]; }; From 7a687b7dbe4c09fc72e6f6e4beab2d0596e8bde7 Mon Sep 17 00:00:00 2001 From: Reed Date: Wed, 1 Jun 2022 18:15:40 -0400 Subject: [PATCH 02/27] shairport-sync: add dbus, mpris, and metadata flags --- pkgs/servers/shairport-sync/default.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index ed3c0dcc7f9d..dbe478568ac6 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -1,6 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, avahi, alsa-lib -, libdaemon, popt, pkg-config, libconfig, libpulseaudio, soxr }: +{ lib, stdenv, fetchFromGitHub +, autoreconfHook, pkg-config +, openssl, avahi, alsa-lib, glib, libdaemon, popt, libconfig, libpulseaudio, soxr +, enableDbus ? stdenv.isLinux +, enableMetadata ? false +, enableMpris ? stdenv.isLinux +}: +with lib; stdenv.mkDerivation rec { version = "3.3.9"; pname = "shairport-sync"; @@ -23,7 +29,12 @@ stdenv.mkDerivation rec { libconfig libpulseaudio soxr - ]; + ] ++ optional stdenv.isLinux glib; + + prePatch = '' + sed -i -e 's/G_BUS_TYPE_SYSTEM/G_BUS_TYPE_SESSION/g' dbus-service.c + sed -i -e 's/G_BUS_TYPE_SYSTEM/G_BUS_TYPE_SESSION/g' mpris-service.c + ''; enableParallelBuilding = true; @@ -32,7 +43,10 @@ stdenv.mkDerivation rec { "--with-avahi" "--with-ssl=openssl" "--with-soxr" "--without-configfiles" "--sysconfdir=/etc" - ]; + ] + ++ optional enableDbus "--with-dbus-interface" + ++ optional enableMetadata "--with-metadata" + ++ optional enableMpris "--with-mpris-interface"; meta = with lib; { inherit (src.meta) homepage; From 37e98f1eef97553c9e04e9f69bc8c9c500fc63d1 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Sun, 19 Jun 2022 22:02:59 -0300 Subject: [PATCH 03/27] egl-wayland: 1.1.9 -> 1.1.10 --- pkgs/development/libraries/egl-wayland/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index 3881f8f7ee38..83cde54f348e 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -42,7 +42,7 @@ let in stdenv.mkDerivation rec { pname = "egl-wayland"; - version = "1.1.9"; + version = "1.1.10"; outputs = [ "out" "dev" ]; @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { owner = "Nvidia"; repo = pname; rev = version; - sha256 = "sha256-rcmGVEcOtKTR8sVkHV7Xb+8NuKWUapYn+/Fswi4z6Mc="; + sha256 = "sha256-dbcEMtPnzF2t7O8YtKVUGSvJqb5WPMmmW+SyqOFnDY4="; }; depsBuildBuild = [ From d194ad962764cf69dd1b138adfb410bb2b2061fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Mon, 20 Jun 2022 21:57:25 +0200 Subject: [PATCH 04/27] poedit: 3.0.1 -> 3.1 --- pkgs/tools/text/poedit/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index fcb2a7019aca..c64828579c94 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK31-gtk3, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3, boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml, nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "poedit"; - version = "3.0.1"; + version = "3.1"; src = fetchFromGitHub { owner = "vslavik"; repo = "poedit"; rev = "v${version}-oss"; - sha256 = "sha256-PBAOCAO3OrBE7lOho7nJNEpqwds7XiblN/f+GonrXHA="; + sha256 = "sha256-Wxj1xPbtupEnzuvf7JdUgdTxX2oAZDEYk6W4CjrmRRE="; }; nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook libxslt xmlto boost libtool pkg-config ]; - buildInputs = [ lucenepp nlohmann_json wxGTK31-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; + buildInputs = [ lucenepp nlohmann_json wxGTK30-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; propagatedBuildInputs = [ gettext ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2284cbdef4d..c1261c0beff7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9548,7 +9548,7 @@ with pkgs; pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; poedit = callPackage ../tools/text/poedit { - wxGTK31-gtk3 = wxGTK31-gtk3.override { withWebKit = true; }; + wxGTK30-gtk3 = wxGTK30-gtk3.override { withWebKit = true; }; }; polipo = callPackage ../servers/polipo { }; From 0b7337095ae8979741ccf8df448165b70b7c19c1 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 20 Jun 2022 22:17:55 +0200 Subject: [PATCH 05/27] gnonograms: 2.0.0 -> 2.1.2 --- pkgs/games/gnonograms/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/games/gnonograms/default.nix b/pkgs/games/gnonograms/default.nix index 21f522d3418f..2446384ff719 100644 --- a/pkgs/games/gnonograms/default.nix +++ b/pkgs/games/gnonograms/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , vala , meson , ninja @@ -19,24 +18,15 @@ stdenv.mkDerivation rec { pname = "gnonograms"; - version = "2.0.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "jeremypw"; repo = "gnonograms"; rev = "v${version}"; - sha256 = "sha256-2uXaybpCAm9cr0o7bqfhgD7mMNPwtv1X/PgnFnSDOl0="; + sha256 = "sha256-TkEVjrwlr4Q5FsfcdY+9fxwaMq+DFs0RwGI2E+GT5Mk="; }; - patches = [ - # Fix build with meson 0.61, can be removed on next release - # https://github.com/jeremypw/gnonograms/pull/45 - (fetchpatch { - url = "https://github.com/jeremypw/gnonograms/commit/0e90d8ff42d64a94002ec8500889bc4d7e06c1b6.patch"; - sha256 = "sha256-G/yqsZFmOA69A3E2CROMYAS5vmok/K5l1S/M2m8DMh4="; - }) - ]; - postPatch = '' patchShebangs meson/post_install.py ''; From 55364f67067085e31703f8d2e6ec4cfeb9354c84 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 20 Jun 2022 21:24:13 +0100 Subject: [PATCH 06/27] rtmpdump: unstable-2019-03-30 -> unstable-2021-02-19 Contains single but important change: orbea (1): Fix race condition in the librtmp install target. --- pkgs/tools/video/rtmpdump/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 5f301ae88915..6e05f81fcd8c 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -15,13 +15,13 @@ assert (gnutlsSupport || opensslSupport); with lib; stdenv.mkDerivation { pname = "rtmpdump"; - version = "unstable-2019-03-30"; + version = "unstable-2021-02-19"; src = fetchgit { url = "git://git.ffmpeg.org/rtmpdump"; # Currently the latest commit is used (a release has not been made since 2011, i.e. '2.4') - rev = "c5f04a58fc2aeea6296ca7c44ee4734c18401aa3"; - sha256 = "07ias612jgmxpam9h418kvlag32da914jsnjsfyafklpnh8gdzjb"; + rev = "f1b83c10d8beb43fcc70a6e88cf4325499f25857"; + sha256 = "0vchr0f0d5fi0zaa16jywva5db3x9dyws7clqaq32gwh5drbkvs0"; }; patches = [ From ec8f7e4008ca8ab0c3468f83b84f57d3352d2ef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 20 Jun 2022 22:47:13 +0000 Subject: [PATCH 07/27] chatty: 0.6.4 -> 0.6.6 https://source.puri.sm/Librem5/chatty/-/blob/v0.6.6/NEWS --- .../networking/instant-messengers/chatty/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index 35266eff9009..a6e31573ae81 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.6.4"; + version = "0.6.6"; src = fetchFromGitLab { domain = "source.puri.sm"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { repo = "chatty"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-uDuSx+tWv6DV93/99QUcUKZaWA9kNW8phHZhetYlG/M="; + hash = "sha256-vwgXfoyZOCSMnRAB6bFSrtYlSrpMa9OOcmxYTqhU+lA="; }; postPatch = '' @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "XMPP and SMS messaging via libpurple and ModemManager"; homepage = "https://source.puri.sm/Librem5/chatty"; + changelog = "https://source.puri.sm/Librem5/chatty/-/blob/${src.rev}/NEWS"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda tomfitzhenry ]; platforms = platforms.linux; From 464a8c94b18149c7a69b56fad1c63c2d19f3db9a Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 21 Jun 2022 17:48:41 +0200 Subject: [PATCH 08/27] threema-desktop: 1.2.0 -> 1.2.13 --- .../instant-messengers/threema-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix index 0951f1d3d8e7..e9bc45b3a3f9 100644 --- a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "threema-desktop"; - version = "1.2.0"; + version = "1.2.13"; src = fetchurl { # As Threema only offers a Latest Release url, the plan is to upload each # new release url to web.archive.org until their Github releases page gets populated. - url = "https://web.archive.org/web/20220408213031if_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; - sha256 = "7c8e1e76ad82a0cf776eb8b0a683a41a00dc8752bb79a24b0ae9d795fdedcde6"; + url = "https://web.archive.org/web/20220621152620id_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; + sha256 = "sha256-X16GMxUIKUloj0FxhzWQKUBf4zwfSBVg0cwLgGxHPHE="; }; nativeBuildInputs = [ From e2eb2550b7f885453d0d7a2814945fd73585a05e Mon Sep 17 00:00:00 2001 From: lunik1 Date: Tue, 21 Jun 2022 22:47:01 +0100 Subject: [PATCH 09/27] =?UTF-8?q?megacmd:=201.5.0c=20=E2=86=92=201.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/megacmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index afdfc6c905e0..2d5b6ee8f2ae 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.5.0c"; + version = "1.5.1"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "sha256-JHuGkf6TBOZMvoP7Izm5/T9AWxyjaqrxR99x4bm7tVE="; + sha256 = "sha256-qOXw/KGt3DyWQGBe/pbMujQITCMItHobxuK+1r00ZIs="; fetchSubmodules = true; }; From ddeb50d445e65fc7d6bedd2dd347439e62fc4450 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jun 2022 02:36:18 +0000 Subject: [PATCH 10/27] flameshot: 11.0.0 -> 12.0.0 --- pkgs/tools/misc/flameshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 82cf7a3b78fd..4bbe0508c12c 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "flameshot"; - version = "11.0.0"; + version = "12.0.0"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; rev = "v${version}"; - sha256 = "sha256-SlnEXW3Uhdgl0icwYyYsKQOcYkAtHpAvL6LMXBF2gWM="; + sha256 = "sha256-ByW+XYTaeBTTbOaxNeF367nqgnBM+EC8jm+PmwHcVGQ="; }; passthru = { From 8df67a3a89fe29bb22725e71f7191f79647a57ca Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 22 Jun 2022 19:45:29 +0100 Subject: [PATCH 11/27] nkf: pull upstream fix for parallel build failure Without the change parallel build fails as: cp -f nkf ...-nkf-2.1.5/bin/ mkdir ...-nkf-2.1.5/man/ja mkdir: cannot create directory '...-nkf-2.1.5/man/ja': No such file or directory --- pkgs/tools/text/nkf/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/nkf/default.nix b/pkgs/tools/text/nkf/default.nix index a2b5f66a6e91..9a70ea9461af 100644 --- a/pkgs/tools/text/nkf/default.nix +++ b/pkgs/tools/text/nkf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "nkf"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0i5dbcb9aipwr8ym4mhvgf1in3frl6y8h8x96cprz9s7b11xz9yi"; }; + patches = [ + # Pull upstream fix for parllel build failures + (fetchpatch { + name = "parallel-install.patch"; + url = "http://git.osdn.net/view?p=nkf/nkf.git;a=patch;h=9ccff5975bec7963e591e042e1ab1139252a4dc9"; + sha256 = "00f0x414gfch650b20w0yj5x2bd67hchmadl7v54lk3vdgkc6jwj"; + }) + ]; + makeFlags = [ "prefix=$(out)" ]; meta = { From 2d9ea7483517a50c669f37d72dc1e0d47db04362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 22 Jun 2022 23:11:05 +0200 Subject: [PATCH 12/27] python310Packages.email-validator: normalize attr, update meta --- pkgs/development/python-modules/email-validator/default.nix | 3 +-- pkgs/development/python-modules/fastapi-mail/default.nix | 4 ++-- pkgs/development/python-modules/flask-admin/default.nix | 4 ++-- pkgs/development/python-modules/flask-appbuilder/default.nix | 4 ++-- pkgs/development/python-modules/flask-mongoengine/default.nix | 4 ++-- .../development/python-modules/flask-security-too/default.nix | 4 ++-- pkgs/development/python-modules/flask-wtf/default.nix | 4 ++-- pkgs/development/python-modules/ihatemoney/default.nix | 4 ++-- pkgs/development/python-modules/pydantic/default.nix | 4 ++-- pkgs/development/python-modules/vaa/default.nix | 4 ++-- pkgs/development/python-modules/wtforms/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index b6112bb87dcc..bdd830810fb3 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -44,10 +44,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A robust email syntax and deliverability validation library for Python 2.x/3.x."; + description = "A robust email syntax and deliverability validation library"; homepage = "https://github.com/JoshData/python-email-validator"; license = licenses.cc0; maintainers = with maintainers; [ siddharthist ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix index 8b3c6d0ed056..973c810b6347 100644 --- a/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/pkgs/development/python-modules/fastapi-mail/default.nix @@ -3,7 +3,7 @@ , aiosmtplib , blinker , buildPythonPackage -, email_validator +, email-validator , fakeredis , fastapi , fetchFromGitHub @@ -45,7 +45,7 @@ buildPythonPackage rec { aioredis aiosmtplib blinker - email_validator + email-validator fakeredis fastapi httpx diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index 6a1ea3991cfa..75573c7a69d6 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -2,7 +2,7 @@ , arrow , buildPythonPackage , colour -, email_validator +, email-validator , enum34 , fetchPypi , flask @@ -45,7 +45,7 @@ buildPythonPackage rec { checkInputs = [ arrow colour - email_validator + email-validator flask_sqlalchemy flask-babelex flask-mongoengine diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 5276fceb3f51..9b0e993b1eb3 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -5,7 +5,7 @@ , apispec , colorama , click -, email_validator +, email-validator , flask , flask-babel , flask_login @@ -56,7 +56,7 @@ buildPythonPackage rec { apispec colorama click - email_validator + email-validator flask flask-babel flask_login diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index ee05ff420333..e411d1f55a78 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -8,7 +8,7 @@ , nose , rednose , coverage -, email_validator +, email-validator }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - email_validator + email-validator flask flask-wtf mongoengine diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index ec088d5332c1..e1a598d3a0ba 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -23,7 +23,7 @@ # propagates , blinker -, email_validator +, email-validator , flask , flask_login , flask_principal @@ -54,7 +54,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ blinker - email_validator + email-validator flask flask_login flask_principal diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index fcfa4835be7c..014f250128c3 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -4,7 +4,7 @@ , flask , itsdangerous , wtforms -, email_validator +, email-validator , pytestCheckHook }: @@ -25,7 +25,7 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - email = [ email_validator ]; + email = [ email-validator ]; }; checkInputs = [ diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index dafea4e2cb20..bacaea2f2cb1 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -10,7 +10,7 @@ , cachetools , click , dnspython -, email_validator +, email-validator , flask , flask-babel , flask-cors @@ -60,7 +60,7 @@ buildPythonPackage rec { click debts dnspython - email_validator + email-validator flask flask_mail flask_migrate diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index a886b5ba78ce..25a5d54d529e 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , cython , devtools -, email_validator +, email-validator , fetchFromGitHub , pytest-mock , pytestCheckHook @@ -57,7 +57,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ devtools - email_validator + email-validator python-dotenv typing-extensions ]; diff --git a/pkgs/development/python-modules/vaa/default.nix b/pkgs/development/python-modules/vaa/default.nix index 783cc7bd6811..d43f007c35cd 100644 --- a/pkgs/development/python-modules/vaa/default.nix +++ b/pkgs/development/python-modules/vaa/default.nix @@ -9,7 +9,7 @@ , marshmallow , pyschemes , wtforms -, email_validator +, email-validator }: buildPythonPackage rec { @@ -42,7 +42,7 @@ buildPythonPackage rec { marshmallow pyschemes wtforms - email_validator + email-validator ]; pythonImportsCheck = [ "vaa" ]; diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index c6a3ecf2088a..ef2e06cc3e71 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -4,7 +4,7 @@ , markupsafe , babel , pytestCheckHook -, email_validator +, email-validator }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - email_validator + email-validator ]; pythonImportsCheck = [ "wtforms" ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 04f93fd015e9..326e0a74913d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -69,6 +69,7 @@ mapAliases ({ dogpile_cache = dogpile-cache; # added 2021-10-28 dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03 + email_validator = email-validator; # added 2022-06-22 fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 flask_testing = flask-testing; # added 2022-04-25 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ffa21b26996..0b12f32360a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2739,7 +2739,7 @@ in { emailthreads = callPackage ../development/python-modules/emailthreads { }; - email_validator = callPackage ../development/python-modules/email-validator { }; + email-validator = callPackage ../development/python-modules/email-validator { }; embrace = callPackage ../development/python-modules/embrace { }; From 10d97b774cbfa7fca616ed3c7ea0c2a0bf33cc60 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Thu, 23 Jun 2022 13:34:18 -0400 Subject: [PATCH 13/27] anytype: 0.25.4 -> 0.26.1 --- pkgs/applications/misc/anytype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 07cbee42694d..6e28c58798e7 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.25.4"; + version = "0.26.1"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-v6Zecv/m1GvPJk/SmLlxHFyeYbNbIB+x17+AKCI45AM="; + sha256 = "sha256-lPzeYZzerFa0T77uaavvBQkMn4PUEfVj4SPlErqM9DI="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in From 8840b83dbfbe7595b48131616607be3ed9030d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 Jun 2022 20:08:21 +0200 Subject: [PATCH 14/27] python310Packages.proto-plus: 1.20.5 -> 1.20.6 --- pkgs/development/python-modules/proto-plus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index ace9537c1d04..3db023447f61 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.20.5"; + version = "1.20.6"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-gXlOsb4zPGeYYzOUjfcOu4zfU44Dn4z6kv0qnXF21AU="; + sha256 = "sha256-RJtFN+g/R3a9aQUcTXdtuP/j+dBkHx6HsGwRbrlMkOk="; }; propagatedBuildInputs = [ protobuf ]; From 396fc796441d01f7832bbcaa16664a1eb5e01261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 Jun 2022 20:26:26 +0200 Subject: [PATCH 15/27] hound: 0.5.0 -> 0.5.1 --- pkgs/development/tools/misc/hound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index 4a2b4ac60360..7e46fadf362e 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "hound"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "hound-search"; repo = "hound"; rev = "v${version}"; - sha256 = "sha256-FNK6SgISGqx+O7Vgp+KOqQyPhqzERDjeo6mQIX1SXnA="; + sha256 = "sha256-1URhb+ZrtP5eGS2o7lBxvAxQJR/J6oE+pCbJ7sQb0X4="; }; vendorSha256 = "sha256-ZgF/PB3VTPx367JUkhOkSEK1uvqENNG0xuNXvCGENnQ="; From 736c9800c91372632999f8f5e3de4c76ab0534f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 Jun 2022 20:44:59 +0200 Subject: [PATCH 16/27] docker-compose: 2.6.0 -> 2.6.1 --- pkgs/applications/virtualization/docker/compose.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 98af8ebf7fb5..583a3e50a1f5 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-Fg99ugaqH/jL3KUZ5Vh/SJnqzEyOaR/KuPFwt2oqXxM="; + sha256 = "sha256-D3+qDWxg3e5/3UIMz8FZDuxmQHmTv0NJVT/otGYedtw="; }; - vendorSha256 = "sha256-7uNQNO+EI90J2Btz2tnumKqd+AtVWON+Csh6tkTNKNA="; + vendorSha256 = "sha256-WxLQfu65Gr+ao/pM8B2uiS88sNT72Klhz7ZIrEadW5g="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; From f19d13394d8e87c0350efba1511d7d8872f110fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 Jun 2022 20:54:28 +0200 Subject: [PATCH 17/27] debian-goodies: 0.87 -> 0.88 --- pkgs/applications/misc/debian-goodies/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/debian-goodies/default.nix b/pkgs/applications/misc/debian-goodies/default.nix index 20d47e204f7c..560afe32b8a1 100644 --- a/pkgs/applications/misc/debian-goodies/default.nix +++ b/pkgs/applications/misc/debian-goodies/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "debian-goodies"; - version = "0.87"; + version = "0.88"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debian-goodies"; rev = "debian/${version}"; - sha256 = "sha256-7O2AY7tWYiOIy4ImFBxWu6S+ljc3VmqS/j4KyEzVVIA="; + sha256 = "sha256-SDGWRGwRuryCJSWjuYB+Cg/Pl8q4VP4zcisUOn/GhJY="; }; postPatch = '' From 4ecf88be2dbb46c039f433043317de53a1cf13e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Thu, 23 Jun 2022 16:34:12 -0300 Subject: [PATCH 18/27] discord: add openasar option --- .../instant-messengers/discord/darwin.nix | 10 ++++- .../instant-messengers/discord/default.nix | 7 +++- .../instant-messengers/discord/linux.nix | 10 ++++- .../instant-messengers/discord/openasar.nix | 42 +++++++++++++++++++ 4 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/discord/openasar.nix diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix index 4bc9ac98df1f..494a7e6a4428 100644 --- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -1,4 +1,4 @@ -{ pname, version, src, meta, stdenv, binaryName, desktopName, undmg }: +{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg }: stdenv.mkDerivation { inherit pname version src meta; @@ -8,7 +8,15 @@ stdenv.mkDerivation { sourceRoot = "."; installPhase = '' + runHook preInstall + mkdir -p $out/Applications cp -r "${desktopName}.app" $out/Applications + + runHook postInstall + ''; + + postInstall = lib.strings.optionalString (openasar != null) '' + cp -f ${openasar} $out/Applications/${desktopName}.app/Contents/Resources/app.asar ''; } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index ab471ef47fb7..957efb7a1a48 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,4 +1,4 @@ -{ branch ? "stable", pkgs, lib, stdenv }: +{ branch ? "stable", pkgs, lib, stdenv, withOpenASAR ? false }: let inherit (pkgs) callPackage fetchurl; versions = if stdenv.isLinux then { @@ -61,8 +61,11 @@ let ++ lib.optionals (branch == "ptb") [ "aarch64-darwin" ]; }; package = if stdenv.isLinux then ./linux.nix else ./darwin.nix; + + openasar = if withOpenASAR then callPackage ./openasar.nix { } else null; + packages = (builtins.mapAttrs - (_: value: callPackage package (value // { inherit src version; meta = meta // { mainProgram = value.binaryName; }; })) + (_: value: callPackage package (value // { inherit src version openasar; meta = meta // { mainProgram = value.binaryName; }; })) { stable = rec { pname = "discord"; diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 74e424aaf1df..28c1d353ff61 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -1,4 +1,4 @@ -{ pname, version, src, meta, binaryName, desktopName, autoPatchelfHook +{ pname, version, src, openasar, meta, binaryName, desktopName, autoPatchelfHook , makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk , at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf , glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11 @@ -72,6 +72,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + mkdir -p $out/{bin,opt/${binaryName},share/pixmaps,share/icons/hicolor/256x256/apps} mv * $out/opt/${binaryName} @@ -95,6 +97,12 @@ stdenv.mkDerivation rec { ln -s $out/opt/${binaryName}/discord.png $out/share/icons/hicolor/256x256/apps/${pname}.png ln -s "${desktopItem}/share/applications" $out/share/ + + runHook postInstall + ''; + + postInstall = lib.strings.optionalString (openasar != null) '' + cp -f ${openasar} $out/opt/${binaryName}/resources/app.asar ''; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/pkgs/applications/networking/instant-messengers/discord/openasar.nix new file mode 100644 index 000000000000..e378f490c0f4 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchFromGitHub, nodejs, bash, nodePackages }: + +stdenv.mkDerivation rec { + version = "unstable-2022-06-10"; + pname = "openasar"; + + src = fetchFromGitHub { + owner = "GooseMod"; + repo = "OpenAsar"; + rev = "c6f2f5eb7827fea14cb4c54345af8ff6858c633a"; + sha256 = "m6e/WKGgkR8vjKcHSNdWE25MmDQM1Z3kgB24OJgbw/w="; + }; + + buildPhase = '' + runHook preBuild + + bash scripts/injectPolyfills.sh + substituteInPlace src/index.js --replace 'nightly' '${version}' + ${nodejs}/bin/node scripts/strip.js + ${nodePackages.asar}/bin/asar pack src app.asar + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install app.asar $out + + runHook postInstall + ''; + + doCheck = false; + + meta = with lib; { + description = "Open-source alternative of Discord desktop's \"app.asar\"."; + homepage = "https://openasar.dev"; + license = licenses.mit; + maintainers = with maintainers; [ pedrohlc ]; + platforms = nodejs.meta.platforms; + }; +} From 64938ed3918114605ca20028b93b10555e9c4e11 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 23 Jun 2022 16:42:57 -0300 Subject: [PATCH 19/27] discord: no pkgs in inputs --- .../networking/instant-messengers/discord/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 9 +++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 957efb7a1a48..54bd7acf6833 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,6 +1,5 @@ -{ branch ? "stable", pkgs, lib, stdenv, withOpenASAR ? false }: +{ branch ? "stable", callPackage, fetchurl, lib, stdenv, withOpenASAR ? false }: let - inherit (pkgs) callPackage fetchurl; versions = if stdenv.isLinux then { stable = "0.0.18"; ptb = "0.0.29"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d525f2e5da02..b3a11961d6c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35212,19 +35212,16 @@ with pkgs; mpvc = callPackage ../applications/misc/mpvc { }; - discord = import ../applications/networking/instant-messengers/discord { + discord = callPackage ../applications/networking/instant-messengers/discord { branch = "stable"; - inherit pkgs lib stdenv; }; - discord-ptb = import ../applications/networking/instant-messengers/discord { + discord-ptb = callPackage ../applications/networking/instant-messengers/discord { branch = "ptb"; - inherit pkgs lib stdenv; }; - discord-canary = import ../applications/networking/instant-messengers/discord { + discord-canary = callPackage ../applications/networking/instant-messengers/discord { branch = "canary"; - inherit pkgs lib stdenv; }; golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {}; From 567738b1d410ead51c38eb64b940e4d57a869278 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 22:09:23 +0200 Subject: [PATCH 20/27] sslscan: 2.0.13 -> 2.0.14 --- pkgs/tools/security/sslscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index ae94b6e25470..6c112d6488da 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sslscan"; - version = "2.0.13"; + version = "2.0.14"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = version; - sha256 = "sha256-boXp26f8jiw73lMLwUMuAuDBRIw8JzokYadbKx/VeSg="; + sha256 = "sha256-CqfxiTRIgrr4J6qThDFqohkxJj5Byf0vQzG+voAEzag="; }; buildInputs = [ openssl ]; From 710f6606659d803b9cd486f75ff70a00d58ad9dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 23:40:21 +0200 Subject: [PATCH 21/27] checkov: 2.1.4 -> 2.1.5 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 06ba4fe762ef..6cb98bf10d4d 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,14 +32,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.1.4"; + version = "2.1.5"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-J8CpNeON2qOaU/U7LbIOaQ/DJ/7Q+kLzzw+jD1QLkik="; + hash = "sha256-bH7W+GZ4O32ty5YD4hfKz2R10v7zEJLU1kLzKvdx3E4="; }; nativeBuildInputs = with py.pkgs; [ From f6770a9d96f0efeb95fc30b60182af679c5e22cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 01:55:30 +0000 Subject: [PATCH 22/27] python310Packages.django-debug-toolbar: 3.4 -> 3.5 --- .../python-modules/django-debug-toolbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index 871b8bb852e6..b4409dc04d4c 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "3.4"; + version = "3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tXQZcQvdGEtcIAtER1s2HSVkGHW0sdrnC+i01+RuSXg="; + hash = "sha256-OZWO3tXZ+p+zKtQHCkj0kGSXpDFHFV+HqSgiJvLmMTg="; }; propagatedBuildInputs = [ From 6fae48936bf1691c87893f89140c9e453127607b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 03:46:47 +0000 Subject: [PATCH 23/27] dsq: 0.20.1 -> 0.20.2 --- pkgs/tools/misc/dsq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix index 1d6dde3c3cff..62a17142bde6 100644 --- a/pkgs/tools/misc/dsq/default.nix +++ b/pkgs/tools/misc/dsq/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "dsq"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "multiprocessio"; repo = "dsq"; rev = version; - hash = "sha256-zTrIs6Q/+PW6CKCx1L8VaXhc1ZAqbb+Od+LJNjPCOTs="; + hash = "sha256-dgx1rFdhEtvyH/N3AtQE89ASBoE3CLl+ZFWwWWYe0II="; }; vendorSha256 = "sha256-bLaBBWChK2RKXd/rX9m9UfHu8zt0j8TOm5S2M02U91A="; From 0de6e1dfb07cf43b31ce72bd48ae54bc0254d0f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 05:56:20 +0000 Subject: [PATCH 24/27] python310Packages.youtube-search-python: 1.6.5 -> 1.6.6 --- .../python-modules/youtube-search-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix index 9383d4cb0598..11da850c992d 100644 --- a/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/pkgs/development/python-modules/youtube-search-python/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "youtube-search-python"; - version = "1.6.5"; + version = "1.6.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-1B7rppa+s/oE8w91Ca7ogjkNHu5pFSnNmDyUopCWEY8="; + hash = "sha256-RWjR12ns1+tLuDZfBO7G42TF9w7sezdl9UPa67E1/PU="; }; propagatedBuildInputs = [ From c889a0dd6a818f7ef5714ae4269d7daaea831b16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 06:14:53 +0000 Subject: [PATCH 25/27] python310Packages.mockito: 1.3.1 -> 1.3.3 --- pkgs/development/python-modules/mockito/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index 1d2509c4a75e..e9af134ba111 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: buildPythonPackage rec { - version = "1.3.1"; + version = "1.3.3"; pname = "mockito"; src = fetchPypi { inherit pname version; - sha256 = "sha256-o8Hg3UnxWbJITBu/IjsbWRHDiJ5smffKUNHAqG21170="; + sha256 = "sha256-mCRTdihXcyMHNPJkmGWLHcBFrTvhNCH1CMcaXHaVe8E="; }; propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ]; From de43d937f503940541275c4c4c7f1ce4fb5a1dfb Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 24 Jun 2022 16:29:01 +0800 Subject: [PATCH 26/27] v2ray-geoip: 202205260055 -> 202206230045 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index a6954100d547..e4ab5df75842 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202205260055"; + version = "202206230045"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "96f4639373709f7560ccaf374d1ff008781aa324"; - sha256 = "sha256-aFTLeYr+JishhJ2AhGMrD02fKxci2rREkh8HN9HtXLs="; + rev = "2e2aba7f3dfb4139e8a882f85350045f2ef522d1"; + sha256 = "sha256-WFvS51RmkAWivYj0HFAT6S3euJk+GSYLDTN3cmkcCNs="; }; installPhase = '' From 5525e6a2026acc23036d85354b31d5339898404c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 24 Jun 2022 16:34:52 +0800 Subject: [PATCH 27/27] v2ray-domain-list-community: 20220528180904 -> 20220624025859 --- pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 5e84f479d21b..a5bbb2b5c013 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20220528180904"; + version = "20220624025859"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-j1Q7B/U0OADOcgJRJ269Jx9Z5dmmT4T2eaOHeGmUjmc="; + sha256 = "sha256-/4wfTtRsBzOCbx3I3H28tB935xDZPPwHOFFmjiV7kEI="; }; vendorSha256 = "sha256-Igx8yGWWVmVEogvbrosaK13LVs+ZZuYLBNji7iSfzdo="; meta = with lib; {