From 83ac14f820ef075bb1231ee3ec9db4b01505cd10 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Mon, 16 May 2022 09:10:12 +0530 Subject: [PATCH 01/14] cinny: 2.0.2 -> 2.0.3 --- .../networking/instant-messengers/cinny/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index 57fb1b58d90..d27512bf5bc 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "sha256-qVnNVJK/Y76cZTh8QNeSNHDxHA/Ekbt7X6mKYkYAPNU="; + sha256 = "13jg28dypp7x6wgsc6vikbqnagp1grqsdmmwhll8qz9ih9rq9fxd"; }; installPhase = '' From cdbb3a70bb4502d36a21039e149e3421212fcec3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 May 2022 01:40:02 +0000 Subject: [PATCH 02/14] python310Packages.herepy: 3.5.7 -> 3.5.8 --- pkgs/development/python-modules/herepy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/herepy/default.nix b/pkgs/development/python-modules/herepy/default.nix index 71aad2650f3..045910d8a1a 100644 --- a/pkgs/development/python-modules/herepy/default.nix +++ b/pkgs/development/python-modules/herepy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "herepy"; - version = "3.5.7"; + version = "3.5.8"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "abdullahselek"; repo = "HerePy"; - rev = version; - hash = "sha256-iPFFEFGH3csqzDtBtLkVkUezObwiMHNbiD/mTgIrdpo="; + rev = "refs/tags/${version}"; + hash = "sha256-BwuH3GxEXiIFFM0na8Jhgp7J5TPW41/u89LWf+EprG4="; }; propagatedBuildInputs = [ From 1a1747677efe715c2143d3f0e82a79a91c144b85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 May 2022 01:05:05 +0000 Subject: [PATCH 03/14] python310Packages.graphtage: 0.2.5 -> 0.2.6 --- pkgs/development/python-modules/graphtage/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/graphtage/default.nix b/pkgs/development/python-modules/graphtage/default.nix index 500d157427d..a1bec8f3a1f 100644 --- a/pkgs/development/python-modules/graphtage/default.nix +++ b/pkgs/development/python-modules/graphtage/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "graphtage"; - version = "0.2.5"; + version = "0.2.6"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-cFOTbPv7CnRdet7bx5LVq5xp9LG4yNm0oxlW5aSEeZs="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ZazqtrrCsoeJK7acj7Unpl+ZI2JL/khMN2aOSHdCHl0="; }; propagatedBuildInputs = [ From 889bb1a1aa82d7ec5ddaa0164c3add8be6a9bb10 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 16 May 2022 20:52:56 -0400 Subject: [PATCH 04/14] python3Packages.pandas: remove unused commands --- pkgs/development/python-modules/pandas/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 5188ce63795..38173eb4fe0 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -59,16 +59,6 @@ buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/issues/39687 hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; - # For OSX, we need to add a dependency on libcxx, which provides - # `complex.h` and other libraries that pandas depends on to build. - postPatch = lib.optionalString stdenv.isDarwin '' - cpp_sdk="${lib.getDev libcxx}/include/c++/v1"; - echo "Adding $cpp_sdk to the setup.py common_include variable" - substituteInPlace setup.py \ - --replace "['pandas/src/klib', 'pandas/src']" \ - "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" - ''; - doCheck = !stdenv.isAarch32 && !stdenv.isAarch64; # upstream doesn't test this architecture # don't max out build cores, it breaks tests From 1c802f3bfa5324d7915dad3dc2e41234526a2f78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 May 2022 01:54:21 +0000 Subject: [PATCH 05/14] python310Packages.cachelib: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/cachelib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix index 9c0620c8740..5a5c001c135 100644 --- a/pkgs/development/python-modules/cachelib/default.nix +++ b/pkgs/development/python-modules/cachelib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cachelib"; - version = "0.6.0"; + version = "0.7.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pallets"; repo = pname; - rev = version; - sha256 = "sha256-1msDiNYxaETJfVBTaMuNJbSxhOpyRdHkb5CQ+1+ZbbQ="; + rev = "refs/tags/${version}"; + sha256 = "sha256-/378xNkBZHoTJ9Qs8RTYi+QosLs7GBgMOkIDYOaSH1Y="; }; checkInputs = [ From ea940467508243aee5b0efd83ecd33abe5372d70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 15 May 2022 05:50:02 +0000 Subject: [PATCH 06/14] addic7ed-cli: move to top-level --- .../python-modules => tools/misc}/addic7ed-cli/default.nix | 0 pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{development/python-modules => tools/misc}/addic7ed-cli/default.nix (100%) diff --git a/pkgs/development/python-modules/addic7ed-cli/default.nix b/pkgs/tools/misc/addic7ed-cli/default.nix similarity index 100% rename from pkgs/development/python-modules/addic7ed-cli/default.nix rename to pkgs/tools/misc/addic7ed-cli/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03b807a0686..af86ea2bc08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -987,6 +987,8 @@ with pkgs; adafruit-ampy = callPackage ../tools/misc/adafruit-ampy { }; + addic7ed-cli = callPackage ../tools/misc/addic7ed-cli { }; + addlicense = callPackage ../tools/misc/addlicense { }; adlplug = callPackage ../applications/audio/adlplug { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e25e0968fa7..f8f800c2bfc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -195,8 +195,6 @@ in { addict = callPackage ../development/python-modules/addict { }; - addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; - adext = callPackage ../development/python-modules/adext { }; adguardhome = callPackage ../development/python-modules/adguardhome { }; From 5b7e1045c653867d542203099f6ce14ecc9aae06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 May 2022 09:35:51 +0000 Subject: [PATCH 07/14] python310Packages.mt-940: 4.23.0 -> 4.26.0 --- pkgs/development/python-modules/mt-940/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index e1699292944..3b63b02986a 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "4.23.0"; + version = "4.26.0"; pname = "mt-940"; src = fetchPypi { inherit pname version; - sha256 = "9274bc8298b2d4b69cb3936bdcda315b50e45975789f519a237bdec58346b8d7"; + sha256 = "sha256-HL56TXZNkjVnap0XIhBT/xDA2N80NLCLpvuXkxXu6zE="; }; propagatedBuildInputs = lib.optional (!isPy3k) enum34; From 5da9a6908336b383b84df9adbe94801ab76ec370 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 May 2022 00:58:44 +0000 Subject: [PATCH 08/14] python310Packages.numpy-stl: 2.16.3 -> 2.17.0 --- pkgs/development/python-modules/numpy-stl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 312170ee36c..f1af4662a9d 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.16.3"; + version = "2.17.0"; src = fetchPypi { inherit pname version; - sha256 = "95890627001efb2cb8d17418730cdc1bdd64b8dbb9862b01a8e0359d79fe863e"; + sha256 = "sha256-G42ak4w4OAbE2RTe3STN03A43/rZqJBbB8rBm0TlOWU="; }; propagatedBuildInputs = [ From 3c2e95f4f02f492d93067e21a619e8e3ee2a0dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 14 May 2022 15:29:22 +0000 Subject: [PATCH 09/14] python3Packages.pyrfxtrx: 0.28.0 -> 0.29.0 https://github.com/Danielhiversen/pyRFXtrx/releases/tag/0.29.0 --- pkgs/development/python-modules/pyrfxtrx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrfxtrx/default.nix b/pkgs/development/python-modules/pyrfxtrx/default.nix index 30dd52e3eea..663440965fd 100644 --- a/pkgs/development/python-modules/pyrfxtrx/default.nix +++ b/pkgs/development/python-modules/pyrfxtrx/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyrfxtrx"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyRFXtrx"; rev = version; - hash = "sha256-Ty+yIA8amKyV3z++7n1m/YRH0gEoVIVTdX8xiZYp/eM="; + hash = "sha256-0tdT7UIT9F2z9+ufnzaACVxRybWxFjZObYQCd3hcXTk="; }; propagatedBuildInputs = [ From 8eb3f281dc1bd1a0599d29eca38e9bd9cfae3590 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 May 2022 12:13:26 +0000 Subject: [PATCH 10/14] python310Packages.poetry-dynamic-versioning: 0.16.0 -> 0.17.0 --- .../python-modules/poetry-dynamic-versioning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index bdc484fd1bb..ff730f834d7 100644 --- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "poetry-dynamic-versioning"; - version = "0.16.0"; + version = "0.17.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dLtZSm10OYWLRK4eRo83RczW0zBVAUF0HQXLQbeDJCk="; + hash = "sha256-u4rqkwy5C1+OrHJUsc/9Sy3YyxWlsTv8cbB1bBKh2K4="; }; nativeBuildInputs = [ From 277f39afc9ced4db8120d236017c2f2659e4a35d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 17 May 2022 00:05:07 +0200 Subject: [PATCH 11/14] =?UTF-8?q?gnomeExtensions.dash-to-dock:=2071+date?= =?UTF-8?q?=3D2022-02-23=20=E2=86=92=2072?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Supports GNOME 42. https://github.com/micheleg/dash-to-dock/compare/extensions.gnome.org-v71...extensions.gnome.org-v72 --- .../gnome/extensions/dash-to-dock/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix index 9447de1fd4e..e7afab4c9ac 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -4,19 +4,19 @@ , glib , gettext , sassc -, unstableGitUpdater +, gitUpdater }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-dash-to-dock"; - version = "71+date=2022-02-23"; + version = "72"; # Temporarily switched to commit hash because stable version is buggy. src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; - rev = "6f717302747931de6bf35bc9839fb3bd946e2c2f"; - sha256 = "1J8t0R43jBbqpXyH2uVyEK+OvhrCw18WWheflqwe100="; + rev = "extensions.gnome.org-v${version}"; + sha256 = "Cds5Fc+rnvoy01GTZBS7qPh8UC9ekrNBOs+IEkDNkJw="; }; nativeBuildInputs = [ @@ -33,9 +33,10 @@ stdenv.mkDerivation rec { extensionUuid = "dash-to-dock@micxgx.gmail.com"; extensionPortalSlug = "dash-to-dock"; - updateScript = unstableGitUpdater { - stableVersion = true; - tagPrefix = "extensions.gnome.org-v"; + updateScript = gitUpdater { + pname = "gnomeExtensions.dash-to-dock"; + inherit version; + rev-prefix = "extensions.gnome.org-v"; }; }; From 7bd68b1df6456c11973ff3ec736e9c70721c5603 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 May 2022 08:35:59 +0200 Subject: [PATCH 12/14] =?UTF-8?q?link-grammar:=205.10.2=20=E2=86=92=205.10?= =?UTF-8?q?.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/opencog/link-grammar/compare/link-grammar-5.10.2...link-grammar-5.10.3 https://github.com/opencog/link-grammar/compare/link-grammar-5.10.3...link-grammar-5.10.4 --- pkgs/tools/text/link-grammar/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix index c685ef60331..3e348f159c1 100644 --- a/pkgs/tools/text/link-grammar/default.nix +++ b/pkgs/tools/text/link-grammar/default.nix @@ -3,6 +3,7 @@ , fetchurl , pkg-config , python3 +, flex , sqlite , libedit , runCommand @@ -13,18 +14,19 @@ let link-grammar = stdenv.mkDerivation rec { pname = "link-grammar"; - version = "5.10.2"; + version = "5.10.4"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-KM7HUuqg44l66WEzO2knRZ+Laf7+aMKqUnKYPX24abY="; + sha256 = "sha256-Pd4tEsre7aGTlEoereSElisCGXXhwgZDTMt4UEZIf4E="; }; nativeBuildInputs = [ pkg-config python3 + flex ]; buildInputs = [ From 434f417e2c9a939b22409788f6d8b172d31d10ce Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 May 2022 07:51:06 +0200 Subject: [PATCH 13/14] =?UTF-8?q?xdg-dbus-proxy:=200.1.3=20=E2=86=92=200.1?= =?UTF-8?q?.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.4 --- .../libraries/xdg-dbus-proxy/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/development/libraries/xdg-dbus-proxy/default.nix index 95373934a47..b027c95a7e4 100644 --- a/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -1,8 +1,11 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, meson +, ninja , pkg-config , libxslt -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_43 , dbus , glib @@ -10,17 +13,19 @@ stdenv.mkDerivation rec { pname = "xdg-dbus-proxy"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-A7XSjKh5JT3bvOMQmJCb7MoUleqBGmN3pJLijxbAm5s="; + sha256 = "sha256-HsDqtT0eSZZtciNSvP1RrEAtzlGQuu3HSahUHnYWcKs="; }; nativeBuildInputs = [ + meson + ninja pkg-config libxslt - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_43 ]; @@ -32,10 +37,6 @@ stdenv.mkDerivation rec { dbus ]; - configureFlags = [ - "--enable-man" - ]; - # dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory doCheck = false; From 365be2abe0dcecf064a40745c688a11939118b5d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 17 May 2022 07:54:40 +0200 Subject: [PATCH 14/14] pulseeffects-legacy: drop myself from maintainers --- pkgs/applications/audio/pulseeffects-legacy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/pulseeffects-legacy/default.nix b/pkgs/applications/audio/pulseeffects-legacy/default.nix index fad17ac71fd..2a775369d26 100644 --- a/pkgs/applications/audio/pulseeffects-legacy/default.nix +++ b/pkgs/applications/audio/pulseeffects-legacy/default.nix @@ -108,7 +108,7 @@ in stdenv.mkDerivation rec { description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; homepage = "https://github.com/wwmm/pulseeffects"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; badPlatforms = [ "aarch64-linux" ]; };