From c5a9a7edc486118170342eef3176fbd9a344fbca Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 17 Dec 2021 05:53:54 +0200 Subject: [PATCH 01/82] haveged: 1.9.2 -> 1.9.15 --- nixos/modules/services/security/haveged.nix | 66 ++++++++++++--------- pkgs/tools/security/haveged/default.nix | 34 +++++++---- 2 files changed, 62 insertions(+), 38 deletions(-) diff --git a/nixos/modules/services/security/haveged.nix b/nixos/modules/services/security/haveged.nix index 22ece1883446..57cef7e44d50 100644 --- a/nixos/modules/services/security/haveged.nix +++ b/nixos/modules/services/security/haveged.nix @@ -3,12 +3,10 @@ with lib; let - cfg = config.services.haveged; in - { ###### interface @@ -17,14 +15,11 @@ in services.haveged = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable to haveged entropy daemon, which refills - /dev/random when low. - ''; - }; + enable = mkEnableOption '' + haveged entropy daemon, which refills /dev/random when low. + NOTE: does nothing on kernels newer than 5.6. + ''; + # source for the note https://github.com/jirka-h/haveged/issues/57 refill_threshold = mkOption { type = types.int; @@ -39,29 +34,44 @@ in }; - - ###### implementation - config = mkIf cfg.enable { - systemd.services.haveged = - { description = "Entropy Harvesting Daemon"; - unitConfig.Documentation = "man:haveged(8)"; - wantedBy = [ "multi-user.target" ]; + # https://github.com/jirka-h/haveged/blob/a4b69d65a8dfc5a9f52ff8505c7f58dcf8b9234f/contrib/Fedora/haveged.service + systemd.services.haveged = { + description = "Entropy Daemon based on the HAVEGE algorithm"; + unitConfig = { + Documentation = "man:haveged(8)"; + DefaultDependencies = false; + ConditionKernelVersion = "<5.6"; + }; + wantedBy = [ "sysinit.target" ]; + after = [ "systemd-tmpfiles-setup-dev.service" ]; + before = [ "sysinit.target" "shutdown.target" "systemd-journald.service" ]; - path = [ pkgs.haveged ]; - - serviceConfig = { - ExecStart = "${pkgs.haveged}/bin/haveged -F -w ${toString cfg.refill_threshold} -v 1"; - SuccessExitStatus = 143; - PrivateTmp = true; - PrivateDevices = true; - PrivateNetwork = true; - ProtectSystem = "full"; - ProtectHome = true; - }; + serviceConfig = { + ExecStart = "${pkgs.haveged}/bin/haveged -w ${toString cfg.refill_threshold} --Foreground -v 1"; + Restart = "always"; + SuccessExitStatus = "137 143"; + SecureBits = "noroot-locked"; + CapabilityBoundingSet = [ "CAP_SYS_ADMIN" "CAP_SYS_CHROOT" ]; + # We can *not* set PrivateTmp=true as it can cause an ordering cycle. + PrivateTmp = false; + PrivateDevices = true; + ProtectSystem = "full"; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + RestrictNamespaces = true; + RestrictRealtime = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "newuname" "~@mount" ]; + SystemCallErrorNumber = "EPERM"; }; + }; }; } diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/tools/security/haveged/default.nix index b088f07c6e3d..89e079364811 100644 --- a/pkgs/tools/security/haveged/default.nix +++ b/pkgs/tools/security/haveged/default.nix @@ -1,15 +1,29 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "haveged"; - version = "1.9.2"; + version = "1.9.15"; - src = fetchurl { - url = "http://www.issihosts.com/haveged/haveged-${version}.tar.gz"; - sha256 = "0w5ypz6451msckivjriwyw8djydlwffam7x23xh626s2vzdrlzgp"; + src = fetchFromGitHub { + owner = "jirka-h"; + repo = "haveged"; + rev = "v${version}"; + sha256 = "sha256-bU+/lRx0RAqHheNQ9CWT/V0oZnZd0W9EHhhX3RRIZ/0="; }; - meta = { + strictDeps = true; + + postPatch = '' + patchShebangs ent # test shebang + ''; + + installFlags = [ + "sbindir=$(out)/bin" # no reason for us to have a $out/sbin, its just a symlink to $out/bin + ]; + + doCheck = true; + + meta = with lib; { description = "A simple entropy daemon"; longDescription = '' The haveged project is an attempt to provide an easy-to-use, unpredictable @@ -19,9 +33,9 @@ stdenv.mkDerivation rec { of haveged is directed towards improving overall reliability and adaptability while minimizing the barriers to using haveged for other tasks. ''; - homepage = "http://www.issihosts.com/haveged/"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.domenkozar ]; - platforms = lib.platforms.unix; + homepage = "https://github.com/jirka-h/haveged"; + license = licenses.gpl3; + maintainers = with maintainers; [ domenkozar ]; + platforms = platforms.unix; }; } From 38fa6d60419031bbf44760becf8be0f55da622b7 Mon Sep 17 00:00:00 2001 From: Berk Ozkutuk Date: Mon, 31 Jan 2022 22:34:32 +0300 Subject: [PATCH 02/82] anki: apply patch to replace deprecated method --- pkgs/games/anki/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index d1def3740097..a25111bddfe9 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -116,6 +116,11 @@ buildPythonApplication rec { url = "https://sources.debian.org/data/main/a/anki/2.1.15+dfsg-3/debian/patches/fix-mpv-args.patch"; sha256 = "1dimnnawk64m5bbdbjrxw5k08q95l728n94cgkrrwxwavmmywaj2"; }) + (fetchpatch { + name = "anki-2.1.15-unescape.patch"; + url = "https://795309.bugs.gentoo.org/attachment.cgi?id=715200"; + sha256 = "14rz864kdaba4fd1marwkyz9n1jiqnbjy4al8bvwlhpvp0rm1qk6"; + }) ]; # Anki does not use setup.py From 95410d059f9d0dc8bf0540cf811043f66551ba04 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 31 Jan 2022 13:12:27 -0600 Subject: [PATCH 03/82] txr: 231 -> 273 Fixup tests: * keep 017 tests (after fixing), * drop chmod test due to sticky bit failure --- pkgs/tools/misc/txr/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index d5a37e2e67f0..d8ba08611207 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, bison, flex, libffi }: +{ lib, stdenv, fetchurl, bison, flex, libffi, coreutils }: stdenv.mkDerivation rec { pname = "txr"; - version = "231"; + version = "273"; src = fetchurl { url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; - sha256 = "0mcglb84zfmrai2bcdg9j0ck8jp8h7ii2rf4m38yjggy0dvii2lc"; + sha256 = "sha256-l0o60NktIsKn720kO8xzySQBMAVrfYhhWZ8L5K8QrUg="; }; nativeBuildInputs = [ bison flex ]; @@ -17,8 +17,16 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "tests"; - # Remove failing test-- mentions 'usr/bin' so probably related :) - preCheck = "rm -rf tests/017"; + postPatch = '' + # Fixup references to /usr/bin in tests + substituteInPlace tests/017/realpath.tl --replace /usr/bin /bin + substituteInPlace tests/017/realpath.expected --replace /usr/bin /bin + + substituteInPlace tests/018/process.tl --replace /usr/bin/env ${lib.getBin coreutils}/bin/env + ''; + + # Remove failing tests -- 018/chmod tries setting sticky bit + preCheck = "rm -rf tests/018/chmod*"; postInstall = '' d=$out/share/vim-plugins/txr From 8454a7ed0ec9b703ff7a0bd839f8f22b8c391b23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Feb 2022 10:10:41 +0000 Subject: [PATCH 04/82] vultr-cli: 2.12.0 -> 2.12.1 --- pkgs/development/tools/vultr-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index eb08ce7f0dad..6e839617034d 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mT99flZAAhLSynD/8+fa74Mc3KK8pVs+OOFDYNSBzEE="; + sha256 = "sha256-jcZiCZn6AbrjEhMkJQloLhZmfnxqlZxu5TXqH+dDN0s="; }; vendorSha256 = null; From e717c594abb80c90bfbebe61c1d47387906e2d1a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 9 Feb 2022 18:49:39 +0800 Subject: [PATCH 05/82] nixos/pantheon: enable packagekit by default Needed for pantheon.appcenter. --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 70911e02f7e0..b9b0a7f514b8 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -135,6 +135,7 @@ in services.bamf.enable = true; services.colord.enable = mkDefault true; services.fwupd.enable = mkDefault true; + services.packagekit.enable = mkDefault true; services.touchegg.enable = mkDefault true; services.touchegg.package = pkgs.pantheon.touchegg; services.tumbler.enable = mkDefault true; From 59dc15a3d8678332e70086d568695aea0fe24cfe Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 9 Feb 2022 19:14:43 +0800 Subject: [PATCH 06/82] pantheon.appcenter: drop the disable packagekit patch again It is not needed when services.packagekit.enable is set. --- .../add-packagekit-backend-option.patch | 240 ------------------ .../pantheon/apps/appcenter/default.nix | 9 - 2 files changed, 249 deletions(-) delete mode 100644 pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch diff --git a/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch b/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch deleted file mode 100644 index bd519c292c26..000000000000 --- a/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch +++ /dev/null @@ -1,240 +0,0 @@ -From b5d7cb20713eff3b3729e5c5fdd2f15680a29385 Mon Sep 17 00:00:00 2001 -From: Bobby Rong -Date: Sun, 31 Oct 2021 23:12:46 +0800 -Subject: [PATCH] build: add packagekit_backend option - ---- - .github/workflows/main.yml | 7 +++++++ - meson_options.txt | 1 + - src/Application.vala | 4 ++++ - src/Core/BackendAggregator.vala | 2 ++ - src/Core/Package.vala | 21 +++++++++++++-------- - src/Core/UpdateManager.vala | 6 ++++++ - src/Views/Homepage.vala | 4 ++++ - src/meson.build | 10 ++++++++-- - 8 files changed, 45 insertions(+), 10 deletions(-) - -diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml -index daf13654..5dc5a2fb 100644 ---- a/.github/workflows/main.yml -+++ b/.github/workflows/main.yml -@@ -42,6 +42,13 @@ jobs: - meson configure -Dcurated=false -Dpayments=false -Dsharing=false -Dname=Pop\!_Shop build - ninja -C build install - -+ - name: Build (NixOS) -+ env: -+ DESTDIR: out -+ run: | -+ meson configure -Dcurated=false -Dpayments=false -Dpackagekit_backend=false build -+ ninja -C build install -+ - lint: - - runs-on: ubuntu-latest -diff --git a/meson_options.txt b/meson_options.txt -index 0ae93d07..37a6cd8a 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -4,3 +4,4 @@ option('name', type : 'string', value : 'AppCenter', description : 'The name of - option('payments', type : 'boolean', value : true, description : 'Enable payment features and display paid apps') - option('sharing', type : 'boolean', value : true, description : 'Display sharing features, i.e. copyable URLs to appcenter.elementary.io') - option('hide_upstream_distro_apps', type : 'boolean', value : true, description : 'Used for hiding Ubuntu repo apps on elementary OS') -+option('packagekit_backend', type : 'boolean', value : true, description : 'Enable PackageKit backend') -diff --git a/src/Application.vala b/src/Application.vala -index 65fae5aa..7c075076 100644 ---- a/src/Application.vala -+++ b/src/Application.vala -@@ -167,9 +167,11 @@ public class AppCenter.App : Gtk.Application { - - var client = AppCenterCore.Client.get_default (); - -+#if PACKAGEKIT_BACKEND - if (fake_update_packages != null) { - AppCenterCore.PackageKitBackend.get_default ().fake_packages = fake_update_packages; - } -+#endif - - if (silent) { - NetworkMonitor.get_default ().network_changed.connect ((available) => { -@@ -183,6 +185,7 @@ public class AppCenter.App : Gtk.Application { - return; - } - -+#if PACKAGEKIT_BACKEND - if (local_path != null) { - var file = File.new_for_commandline_arg (local_path); - -@@ -192,6 +195,7 @@ public class AppCenter.App : Gtk.Application { - warning ("Failed to load local AppStream XML file: %s", e.message); - } - } -+#endif - - if (main_window == null) { - main_window = new MainWindow (this); -diff --git a/src/Core/BackendAggregator.vala b/src/Core/BackendAggregator.vala -index 539dba98..feb1eaa9 100644 ---- a/src/Core/BackendAggregator.vala -+++ b/src/Core/BackendAggregator.vala -@@ -26,8 +26,10 @@ public class AppCenterCore.BackendAggregator : Backend, Object { - - construct { - backends = new Gee.ArrayList (); -+#if PACKAGEKIT_BACKEND - backends.add (PackageKitBackend.get_default ()); - backends.add (UbuntuDriversBackend.get_default ()); -+#endif - backends.add (FlatpakBackend.get_default ()); - - unowned Gtk.Application app = (Gtk.Application) GLib.Application.get_default (); -diff --git a/src/Core/Package.vala b/src/Core/Package.vala -index d6f12f15..8dbd7a22 100644 ---- a/src/Core/Package.vala -+++ b/src/Core/Package.vala -@@ -328,7 +328,14 @@ public class AppCenterCore.Package : Object { - public string origin_description { - owned get { - unowned string origin = component.get_origin (); -- if (backend is PackageKitBackend) { -+ if (backend is FlatpakBackend) { -+ var fp_package = this as FlatpakPackage; -+ if (fp_package != null && fp_package.installation == FlatpakBackend.system_installation) { -+ return _("%s (system-wide)").printf (origin); -+ } -+ return origin; -+#if PACKAGEKIT_BACKEND -+ } else if (backend is PackageKitBackend) { - if (origin == APPCENTER_PACKAGE_ORIGIN) { - return _("AppCenter"); - } else if (origin == ELEMENTARY_STABLE_PACKAGE_ORIGIN) { -@@ -336,15 +343,9 @@ public class AppCenterCore.Package : Object { - } else if (origin.has_prefix ("ubuntu-")) { - return _("Ubuntu (non-curated)"); - } -- } else if (backend is FlatpakBackend) { -- var fp_package = this as FlatpakPackage; -- if (fp_package != null && fp_package.installation == FlatpakBackend.system_installation) { -- return _("%s (system-wide)").printf (origin); -- } -- -- return origin; - } else if (backend is UbuntuDriversBackend) { - return _("Ubuntu Drivers"); -+#endif - } - - return _("Unknown Origin (non-curated)"); -@@ -434,11 +435,15 @@ public class AppCenterCore.Package : Object { - _author_title = null; - backend_details = null; - -+#if PACKAGEKIT_BACKEND - // The version on a PackageKit package comes from the package not AppStream, so only reset the version - // on other backends - if (!(backend is PackageKitBackend)) { - _latest_version = null; - } -+#else -+ _latest_version = null; -+#endif - - this.component = component; - } -diff --git a/src/Core/UpdateManager.vala b/src/Core/UpdateManager.vala -index 9deceaf5..c92c0d37 100644 ---- a/src/Core/UpdateManager.vala -+++ b/src/Core/UpdateManager.vala -@@ -52,6 +52,7 @@ public class AppCenterCore.UpdateManager : Object { - installed_package.update_state (); - } - -+#if PACKAGEKIT_BACKEND - Pk.Results pk_updates; - unowned PackageKitBackend client = PackageKitBackend.get_default (); - try { -@@ -60,10 +61,12 @@ public class AppCenterCore.UpdateManager : Object { - warning ("Unable to get updates from PackageKit backend: %s", e.message); - return 0; - } -+#endif - - uint os_count = 0; - string os_desc = ""; - -+#if PACKAGEKIT_BACKEND - var package_array = pk_updates.get_package_array (); - debug ("PackageKit backend reports %d updates", package_array.length); - -@@ -87,6 +90,7 @@ public class AppCenterCore.UpdateManager : Object { - ); - } - }); -+#endif - - os_updates.component.set_pkgnames ({}); - os_updates.change_information.clear_update_info (); -@@ -159,6 +163,7 @@ public class AppCenterCore.UpdateManager : Object { - count += 1; - } - -+#if PACKAGEKIT_BACKEND - pk_updates.get_details_array ().foreach ((pk_detail) => { - var pk_package = new Pk.Package (); - try { -@@ -181,6 +186,7 @@ public class AppCenterCore.UpdateManager : Object { - critical (e.message); - } - }); -+#endif - - os_updates.update_state (); - return count; -diff --git a/src/Views/Homepage.vala b/src/Views/Homepage.vala -index 3673903f..2e128e77 100644 ---- a/src/Views/Homepage.vala -+++ b/src/Views/Homepage.vala -@@ -107,9 +107,13 @@ public class AppCenter.Homepage : AbstractView { - column_spacing = 24, - orientation = Gtk.Orientation.VERTICAL - }; -+#if PACKAGEKIT_BACKEND - grid.add (banner_revealer); - grid.add (recently_updated_revealer); - grid.add (categories_label); -+#else -+ category_flow.margin_top = 12; -+#endif - grid.add (category_flow); - - scrolled_window = new Gtk.ScrolledWindow (null, null) { -diff --git a/src/meson.build b/src/meson.build -index 7b319fc6..d1d77931 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -12,10 +12,8 @@ appcenter_files = files( - 'Core/FlatpakBackend.vala', - 'Core/Job.vala', - 'Core/Package.vala', -- 'Core/PackageKitBackend.vala', - 'Core/ScreenshotCache.vala', - 'Core/Task.vala', -- 'Core/UbuntuDriversBackend.vala', - 'Core/UpdateManager.vala', - 'Dialogs/InstallFailDialog.vala', - 'Dialogs/NonCuratedWarningDialog.vala', -@@ -76,6 +74,14 @@ if get_option('hide_upstream_distro_apps') - args += '--define=HIDE_UPSTREAM_DISTRO_APPS' - endif - -+if get_option('packagekit_backend') -+ args += '--define=PACKAGEKIT_BACKEND' -+ appcenter_files += files( -+ 'Core/PackageKitBackend.vala', -+ 'Core/UbuntuDriversBackend.vala', -+ ) -+endif -+ - executable( - meson.project_name(), - appcenter_files, diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index c0c1513e784f..d62141ece2bd 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -38,13 +38,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-xktIHQHmz5gh72NEz9UQ9fMvBlj1BihWxHgxsHmTIB0="; }; - patches = [ - # Introduces a packagekit_backend meson flag. - # Makes appcenter actually work by using only the flatpak backend. - # https://github.com/elementary/appcenter/pull/1739 - ./add-packagekit-backend-option.patch - ]; - nativeBuildInputs = [ appstream-glib dbus # for pkg-config @@ -77,8 +70,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dpayments=false" "-Dcurated=false" - # This option is introduced in add-packagekit-backend-option.patch - "-Dpackagekit_backend=false" ]; postPatch = '' From bb357d8203cc901bf1e729ec544c8c8b52cc329d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 9 Feb 2022 21:22:05 +0800 Subject: [PATCH 07/82] nixos/pantheon: install appcenter if flatpak is enabled This is how nixos/gnome handle gnome-software. --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index b9b0a7f514b8..6a7d2a8aa6cd 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -273,7 +273,7 @@ in }) (mkIf serviceCfg.apps.enable { - environment.systemPackages = (with pkgs.pantheon; pkgs.gnome.removePackagesByName [ + environment.systemPackages = with pkgs.pantheon; pkgs.gnome.removePackagesByName ([ elementary-calculator elementary-calendar elementary-camera @@ -287,7 +287,11 @@ in elementary-terminal elementary-videos epiphany - ] config.environment.pantheon.excludePackages); + ] ++ lib.optionals config.services.flatpak.enable [ + # Only install appcenter if flatpak is enabled before + # https://github.com/NixOS/nixpkgs/issues/15932 is resolved. + appcenter + ]) config.environment.pantheon.excludePackages; # needed by screenshot fonts.fonts = [ From ea611d2e171f3f1722faa7d5cd156c0ff6bef854 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 9 Feb 2022 21:59:43 +0800 Subject: [PATCH 08/82] nixos/pantheon: mention latest appcenter and packagekit changes in manual --- nixos/modules/services/x11/desktop-managers/pantheon.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.xml b/nixos/modules/services/x11/desktop-managers/pantheon.xml index fe0a1c496223..202909d398f0 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.xml +++ b/nixos/modules/services/x11/desktop-managers/pantheon.xml @@ -105,10 +105,10 @@ switchboard-with-plugs.override { - AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. Starting from 21.11, the Flatpak backend should work so you can install some Flatpak applications using it. See this issue. + AppCenter has been available since 20.03. Starting from 21.11, the Flatpak backend should work so you can install some Flatpak applications using it. However, due to missing appstream metadata, the Packagekit backend does not function currently. See this issue. - To use AppCenter on NixOS, add pantheon.appcenter to , enable Flatpak support and optionally add the appcenter Flatpak remote: + If you are using Pantheon, AppCenter should be installed by default if you have Flatpak support enabled. If you also wish to add the appcenter Flatpak remote: $ flatpak remote-add --if-not-exists appcenter https://flatpak.elementary.io/repo.flatpakrepo From 767370c47823abb55b92df89056b5a47494d963e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 9 Feb 2022 22:20:06 +0800 Subject: [PATCH 09/82] pantheon.elementary-default-settings: install dockitem for appcenter --- .../pantheon/desktop/elementary-default-settings/default.nix | 3 +-- .../launchers/io.elementary.appcenter.dockitem | 2 ++ .../overrides/plank-dockitems.gschema.override | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.appcenter.dockitem diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 393186325baf..a42ae92e97af 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -47,8 +47,7 @@ stdenv.mkDerivation rec { ''; preInstall = '' - # Install our override for plank dockitems as Appcenter is not ready to be preinstalled. - # See: https://github.com/NixOS/nixpkgs/issues/70214. + # Install our override for plank dockitems as the desktop file path is different. schema_dir=$out/share/glib-2.0/schemas install -D ${./overrides/plank-dockitems.gschema.override} $schema_dir/plank-dockitems.gschema.override diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.appcenter.dockitem b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.appcenter.dockitem new file mode 100644 index 000000000000..586a74df2447 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.appcenter.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///run/current-system/sw/share/applications/io.elementary.appcenter.desktop diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override b/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override index 426368e8473b..0ba89fa4b40b 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override @@ -1,2 +1,2 @@ [net.launchpad.plank.dock.settings] -dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.tasks.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem'] +dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.tasks.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem'] From 9d74725ec413f97d61db0d5e8399f0dde37e40d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Feb 2022 16:32:40 +0100 Subject: [PATCH 10/82] checkov: 2.0.812 -> 2.0.814 --- 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 b244143ba305..01d857187a3e 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,13 +22,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.812"; + version = "2.0.814"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-dCGcg0v83/KJGCvq2jQSemaHJb5wvluN6U73dRer6gY="; + hash = "sha256-imKVX88QvI+2/x5C8s7yBAg7kFe2JBEdjdH/fWgISyo="; }; nativeBuildInputs = with py.pkgs; [ From 801dca549f70f201fd49476b82d7f2d7cd8e1d72 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 19 Nov 2021 18:16:01 +0200 Subject: [PATCH 11/82] nixos/tools: add networkmanager to configuration template --- nixos/modules/installer/tools/tools.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 2f3b0cdd48f2..f8a0ba34aa08 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -133,7 +133,9 @@ in $bootLoaderConfig # networking.hostName = "nixos"; # Define your hostname. + # Pick only one of the below networking options. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. # Set your time zone. # time.timeZone = "Europe/Amsterdam"; From b2eacd1595216bce991c0b82b83393888c56bc12 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 20 Nov 2021 02:27:10 +0200 Subject: [PATCH 12/82] nixos/tools: add more keymap options to configuration template --- nixos/modules/installer/tools/tools.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index f8a0ba34aa08..ea96989375cb 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -150,6 +150,7 @@ in # console = { # font = "Lat2-Terminus16"; # keyMap = "us"; + # useXkbConfig = true; # use xkbOptions in tty. # }; $xserverConfig @@ -157,7 +158,10 @@ in $desktopConfiguration # Configure keymap in X11 # services.xserver.layout = "us"; - # services.xserver.xkbOptions = "eurosign:e"; + # services.xserver.xkbOptions = { + # "eurosign:e"; + # "caps:escape" # map caps to escape. + # }; # Enable CUPS to print documents. # services.printing.enable = true; From aaf13bb3bd00f506a52e2bebd1ddc8e27e66c62f Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 20 Nov 2021 03:48:59 +0200 Subject: [PATCH 13/82] nixos/nixos-generate-config: fix proram path replacements btrfs-progs was made optional in 2019 c01ea27ce356e1433da01a7b46ba40c880f2f2ac because it didn't cross-compile. it now does --- nixos/modules/installer/tools/nixos-generate-config.pl | 6 +++--- nixos/modules/installer/tools/tools.nix | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index fe8c4fb1a6b5..1220c1849d6a 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -279,7 +279,7 @@ if (`lsblk -o TYPE` =~ "lvm") { push @initrdKernelModules, "dm-snapshot"; } -my $virt = `systemd-detect-virt`; +my $virt = `@detectvirt@`; chomp $virt; @@ -398,7 +398,7 @@ foreach my $fs (read_file("/proc/self/mountinfo")) { # Maybe this is a bind-mount of a filesystem we saw earlier? if (defined $fsByDev{$fields[2]}) { # Make sure this isn't a btrfs subvolume. - my $msg = `btrfs subvol show $rootDir$mountPoint`; + my $msg = `@btrfs@ subvol show $rootDir$mountPoint`; if ($? != 0 || $msg =~ /ERROR:/s) { my $path = $fields[3]; $path = "" if $path eq "/"; my $base = $fsByDev{$fields[2]}; @@ -436,7 +436,7 @@ EOF # Is this a btrfs filesystem? if ($fsType eq "btrfs") { - my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint"); + my ($status, @info) = runCommand("@btrfs@ subvol show $rootDir$mountPoint"); if ($status != 0 || join("", @info) =~ /ERROR:/) { die "Failed to retrieve subvolume info for $mountPoint\n"; } diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index ea96989375cb..b7f508eeb3af 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -33,8 +33,9 @@ let nixos-generate-config = makeProg { name = "nixos-generate-config"; src = ./nixos-generate-config.pl; - path = lib.optionals (lib.elem "btrfs" config.boot.supportedFilesystems) [ pkgs.btrfs-progs ]; perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl"; + detectvirt = "${pkgs.systemd}/bin/systemd-detect-virt"; + btrfs = "${pkgs.btrfs-progs}/bin/btrfs"; inherit (config.system.nixos-generate-config) configuration desktopConfiguration; xserverEnabled = config.services.xserver.enable; }; From b4adac9ba985cd1741f48a3cec865f69a9442cda Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 20 Nov 2021 04:00:46 +0200 Subject: [PATCH 14/82] nixos/nixos-generate-config: move dhcpConfig from configuration.nix to hardware-configuration.nix --- nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ nixos/modules/installer/tools/nixos-generate-config.pl | 7 +++++-- nixos/modules/installer/tools/tools.nix | 1 - 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 0afeefa3b86d..ba6edb5f4302 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -773,6 +773,13 @@ loaded in the initrd. + + + nixos-generate-config now puts the dhcp + configuration in hardware-configuration.nix + instead of configuration.nix. + + fetchFromSourcehut now allows fetching diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 7813d4abd3ee..5bae1f067ed1 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -263,6 +263,8 @@ In addition to numerous new and upgraded packages, this release has the followin - A new option `boot.initrd.extraModprobeConfig` has been added which can be used to configure kernel modules that are loaded in the initrd. +- `nixos-generate-config` now puts the dhcp configuration in `hardware-configuration.nix` instead of `configuration.nix`. + - `fetchFromSourcehut` now allows fetching repositories recursively using `fetchgit` or `fetchhg` if the argument `fetchSubmodules` is set to `true`. diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 1220c1849d6a..57aef50a0f6b 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -558,6 +558,8 @@ if (!$noFilesystems) { $fsAndSwap .= "swapDevices =" . multiLineList(" ", @swapDevices) . ";\n"; } +my $networkingDhcpConfig = generateNetworkingDhcpConfig(); + my $hwConfig = < Date: Thu, 10 Feb 2022 08:28:48 +1000 Subject: [PATCH 15/82] gdu: 5.13.0 -> 5.13.1 https://github.com/dundee/gdu/releases/tag/v5.13.1 --- pkgs/tools/system/gdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index ec94a9f337f8..41e4d99f6a4c 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.13.0"; + version = "5.13.1"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yOYwPr/Yz/PGpCZtv/dWVFgll6VM7wQEtU/jEVpMjlE="; + sha256 = "sha256-bUzL9QkSgzJePBnGSYQvsKC975ss5b3kBdIgwgGzEtk="; }; vendorSha256 = "sha256-9+Zez33oET0nx/Xm3fXh1WFoQduMBodvml1oGO6jUYc="; From eb31e13b541ed6a5580da3653d5c206286f54137 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 9 Feb 2022 23:39:27 +0100 Subject: [PATCH 16/82] proxysql: fix build --- pkgs/servers/sql/proxysql/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index 142dfe29fa22..ab8f7f9a6993 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -129,6 +129,10 @@ stdenv.mkDerivation rec { sed -i s_/usr/bin/env_${coreutils}/bin/env_g libssl/openssl/config + # https://github.com/sysown/proxysql/issues/3679 + # TODO: remove when upgrading past 2.3.2 + sed -i -e 's@^\(\s\+cd curl/curl \&\& ./configure .*\) \(--with-ssl=.*\)$@\1 --without-zstd \2@' Makefile + popd patchShebangs . ''; From 5688e7ff351373f99fae9a7fb452978b5fc99450 Mon Sep 17 00:00:00 2001 From: John Rinehart Date: Thu, 10 Feb 2022 01:15:15 +0200 Subject: [PATCH 17/82] fix: typo in lib/attrsets.nix --- lib/attrsets.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index dafdd98f498e..a88947b45858 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -276,7 +276,7 @@ rec { /* Like `mapAttrsRecursive', but it takes an additional predicate - function that tells it whether to recursive into an attribute + function that tells it whether to recurse into an attribute set. If it returns false, `mapAttrsRecursiveCond' does not recurse, but does apply the map function. If it returns true, it does recurse, and does not apply the map function. From d275f0eecd97566ef5f0d70c836a3674371cde3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 00:52:51 +0000 Subject: [PATCH 18/82] babashka: 0.7.3 -> 0.7.4 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 93755e83a3d6..51314db3f9fc 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-zbxFMc02hbsU2ERlUzqMBHwHYfORB7TkMINrKC52PPU="; + sha256 = "sha256-GphF32CFxZYaoTG1k9pP+cRNs/PIKtwevTcIyjG7CpQ="; }; executable = "bb"; From 4ebed7273319ce9e6661f5794057812dfcc17fe4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 01:28:13 +0000 Subject: [PATCH 19/82] btrbk: 0.31.3 -> 0.32.0 --- pkgs/tools/backup/btrbk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index 969ea26e362b..b04263a7168a 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "btrbk"; - version = "0.31.3"; + version = "0.32.0"; src = fetchurl { url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz"; - sha256 = "1lx7vnf386nsik8mxrrfyx1h7mkqk5zs26sy0s0lynfxcm4lkxb2"; + sha256 = "HmvNtIgFfeaiFuSRobWlcJqusPSYtqAqx+79+CeNVDQ="; }; nativeBuildInputs = [ asciidoctor makeWrapper ]; From 37c635b565982f076345bc756a81b57d484e440d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 01:48:52 +0000 Subject: [PATCH 20/82] cfripper: 1.3.1 -> 1.3.3 --- pkgs/tools/security/cfripper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix index fd39847c014b..1544194983d1 100644 --- a/pkgs/tools/security/cfripper/default.nix +++ b/pkgs/tools/security/cfripper/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.3.1"; + version = "1.3.3"; src = fetchFromGitHub { owner = "Skyscanner"; repo = pname; rev = version; - hash = "sha256-BWdXSHIicMa3PgGoF4GGAOh2LAJWt+7svMLFGhWIkn0="; + hash = "sha256-y3h/atfFl/wDmr+YBdsWrCez4PQBEcl3xNDyTwXZIp4="; }; propagatedBuildInputs = with python3.pkgs; [ From f5417e72aecee6a3bd9377986a30db6469cec386 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 9 Feb 2022 21:00:12 -0500 Subject: [PATCH 21/82] mtpfs: mark as broken on darwin --- pkgs/tools/filesystems/mtpfs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index a2dc01f8c097..58c5a8d54a2c 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; license = licenses.gpl3; maintainers = [ maintainers.qknight ]; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/mtpfs.x86_64-darwin }; } From 04e6bf11c8af20e6e888dd737af26e58352ed742 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 02:04:27 +0000 Subject: [PATCH 22/82] clojure: 1.10.3.1058 -> 1.10.3.1075 --- pkgs/development/interpreters/clojure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 45dc35681c38..e2ab96d41b3f 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.3.1058"; + version = "1.10.3.1075"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "guIQjiWyulITZZSjt/kCtU5qo4FG/2IK2rwBI6Ttfe0="; + sha256 = "5uJtr6uz6mrkoFfzUmUb6vy5H4s1Lag3CNCsGwsQZ9Q="; }; nativeBuildInputs = [ From 4dda99f73f93c3edfc209ccb169f8403fe20cd4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 10 Feb 2022 02:41:28 +0000 Subject: [PATCH 23/82] home-assistant: support senseme component --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 00af1e21899f..ec6d84b44ead 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -761,7 +761,7 @@ "sendgrid" = ps: with ps; [ sendgrid ]; "sense" = ps: with ps; [ sense-energy ]; "sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat - "senseme" = ps: with ps; [ ]; # missing inputs: aiosenseme + "senseme" = ps: with ps; [ aiosenseme ]; "sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo "sensor" = ps: with ps; [ sqlalchemy ]; "sentry" = ps: with ps; [ sentry-sdk ]; @@ -1460,6 +1460,7 @@ "season" "select" "sense" + "senseme" "sensor" "sentry" "seventeentrack" From 69b4c554668a2762a730b80421cbf3c32c251032 Mon Sep 17 00:00:00 2001 From: toastal Date: Thu, 10 Feb 2022 10:12:41 +0700 Subject: [PATCH 24/82] =?UTF-8?q?julia-mono:=200.043=20=E2=86=92=200.044?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/cormullion/juliamono/releases/tag/v0.044 --- pkgs/data/fonts/julia-mono/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index a1f8f316773e..136a3218761c 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "0.043"; + version = "0.044"; in fetchzip { name = "JuliaMono-ttf-${version}"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz"; - sha256 = "sha256-oxQRrFhTf37OrJSbDlmzh/7xOuKrtxO7v2+j7QcsAmE="; + sha256 = "sha256-KCU1eOSEWjYh6kPda/iCtZUIWIq5lK79uUCLl2w7SEg="; postFetch = '' mkdir -p $out/share/fonts/truetype From f4ca7eab458b919a47b019fc66f5e40640ab9067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 10 Feb 2022 04:03:20 +0000 Subject: [PATCH 25/82] esphome.dashboard: use pythonPackages.callPackage --- pkgs/tools/misc/esphome/dashboard.nix | 5 +++-- pkgs/tools/misc/esphome/default.nix | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index 1dd4225ac09b..f36e5217aeaf 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -1,8 +1,9 @@ { lib -, python3 +, buildPythonPackage +, fetchPypi }: -with python3.pkgs; buildPythonPackage rec { +buildPythonPackage rec { pname = "esphome-dashboard"; version = "20220116.0"; diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index e87b88e63b54..d948b13487a4 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , python3 , fetchFromGitHub , fetchpatch @@ -11,7 +10,7 @@ let python = python3.override { packageOverrides = self: super: { - esphome-dashboard = pkgs.callPackage ./dashboard.nix {}; + esphome-dashboard = self.callPackage ./dashboard.nix {}; }; }; in From 063680580c5950e855ffff39d1609c67313f0218 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 10 Feb 2022 14:03:59 +1000 Subject: [PATCH 26/82] go: remove outdated alias throws originally removed in c4156912399fcaaa21e0afb5def6acbd85194518 --- pkgs/top-level/aliases.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 24804ca5e57f..eb35d9f7ea84 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -367,7 +367,6 @@ mapAliases ({ gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12 gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14 gmock = gtest; # moved from top-level 2021-03-14 - go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 go-pup = pup; # added 2017-12-19 gobby5 = gobby; # added 2021-02-01 gobjectIntrospection = gobject-introspection; # added 2018-12-02 From 70a0139e7862294b3d1a849cd55ebe095b1efa25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 03:57:22 +0000 Subject: [PATCH 27/82] python310Packages.pynamodb: 5.2.0 -> 5.2.1 --- pkgs/development/python-modules/pynamodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index 46bc5d49cae1..d3b39457438c 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "5.2.0"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "6c9bec5946949d07c76230187cdb9126e8247c94499bbc8e79ded11d17060a60"; + sha256 = "sha256-x6nFV7UjZLwJJX7dADeO68dSWLvaoP4FD8ziNWFJ+Qo="; }; propagatedBuildInputs = [ python-dateutil botocore ]; From bd2150947460809b200d50df7bbc387b0b1c8b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 10 Feb 2022 03:56:24 +0000 Subject: [PATCH 28/82] python3Packages.srpenergy: 1.3.5 -> 1.3.6 https://github.com/lamoreauxlab/srpenergy-api-client-python/releases/tag/1.3.6 --- pkgs/development/python-modules/srpenergy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/srpenergy/default.nix b/pkgs/development/python-modules/srpenergy/default.nix index c5d20436a09c..d0ac3602445d 100644 --- a/pkgs/development/python-modules/srpenergy/default.nix +++ b/pkgs/development/python-modules/srpenergy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "srpenergy"; - version = "1.3.5"; + version = "1.3.6"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "lamoreauxlab"; repo = "srpenergy-api-client-python"; rev = version; - sha256 = "sha256-s90+gzjcG27pUcMGpzf2rf+mR8/fmpvwBXGfvv3rNGI="; + hash = "sha256-aZnqGtfklWgigac2gdkQv29Qy5HC34zGGY2iWr2cOMo="; }; propagatedBuildInputs = [ From 314de8ae28ef0629b930cf2654ae1658fa0dca5a Mon Sep 17 00:00:00 2001 From: Jean-Francois Chevrette Date: Wed, 12 Jan 2022 13:33:06 -0500 Subject: [PATCH 29/82] add support for aarch64-darwin and x86_64-darwin --- pkgs/misc/vscode-extensions/python/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index beaa8d557a75..a0e64b9197bc 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -72,13 +72,15 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { icu curl openssl + ] ++ lib.optionals stdenv.isLinux [ lttng-ust-2-10 musl ]; nativeBuildInputs = [ - autoPatchelfHook python3.pkgs.wrapPython + ] ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook ]; pythonPath = with python3.pkgs; [ @@ -101,6 +103,8 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { cd pythonFiles/lib/python/debugpy/_vendored/pydevd/pydevd_attach_to_process declare kept_aside="${{ "x86_64-linux" = "attach_linux_amd64.so"; + "aarch64-darwin" = "attach_x86_64.dylib"; + "x86_64-darwin" = "attach_x86_64.dylib"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")}" mv "$kept_aside" "$kept_aside.hidden" rm *.so *.dylib *.dll *.exe *.pdb @@ -118,7 +122,7 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { meta = with lib; { license = licenses.mit; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; maintainers = [ maintainers.jraygauthier ]; }; } From 083c3a940e4f9c6bde8d01d82807d83b83bd3e09 Mon Sep 17 00:00:00 2001 From: Jean-Francois Chevrette Date: Wed, 19 Jan 2022 20:02:12 -0500 Subject: [PATCH 30/82] add jfchevrette as maintainers --- pkgs/misc/vscode-extensions/python/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index a0e64b9197bc..09c5c02aee93 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -123,6 +123,6 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { meta = with lib; { license = licenses.mit; platforms = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; - maintainers = [ maintainers.jraygauthier ]; + maintainers = with maintainers; [ jraygauthier jfchevrette ]; }; } From 290e4ff2caf1151655ff4f760f229b0eac81ebbf Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Wed, 9 Feb 2022 16:07:15 -0800 Subject: [PATCH 31/82] python3Packages.flake8-bugbear: init at 22.1.11 --- .../python-modules/flake8-bugbear/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/flake8-bugbear/default.nix diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix new file mode 100644 index 000000000000..083abcaf6b8c --- /dev/null +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, attrs +, flake8 +, pytestCheckHook +, hypothesis +, hypothesmith +}: + +buildPythonPackage rec { + pname = "flake8-bugbear"; + version = "22.1.11"; + + src = fetchFromGitHub { + owner = "PyCQA"; + repo = pname; + rev = version; + sha256 = "sha256-sTg69Hgvi77wtLWEH4JtcIAMFk7exr5CBXmyS0nE5Vc="; + }; + + propagatedBuildInputs = [ + attrs + flake8 + ]; + + checkInputs = [ + flake8 + pytestCheckHook + hypothesis + hypothesmith + ]; + + meta = with lib; { + homepage = "https://github.com/PyCQA/flake8-bugbear"; + changelog = "https://github.com/PyCQA/flake8-bugbear/blob/${version}/README.rst#change-log"; + description = '' + A plugin for flake8 finding likely bugs and design problems in your + program. + ''; + license = licenses.mit; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b6ef2ecfb83e..e05c11706df1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2861,6 +2861,8 @@ in { flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { }; + flake8-bugbear = callPackage ../development/python-modules/flake8-bugbear { }; + flake8 = callPackage ../development/python-modules/flake8 { }; flake8-length = callPackage ../development/python-modules/flake8-length { }; From 5bdc8550353cfaae158790ab08de4d8be5120314 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 04:38:19 +0000 Subject: [PATCH 32/82] python310Packages.aioesphomeapi: 10.8.1 -> 10.8.2 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index a10a84a0425e..06389d50677b 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "10.8.1"; + version = "10.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "v${version}"; - sha256 = "1hi312gvkrmcxhrc8s3zxwbh87hakd42k5hk7c3xqilc4in3d5dv"; + sha256 = "sha256-zvilMBx9H2VDmu13IiAiCqXEGkbpAJpGnt4Ea7FlGVI="; }; propagatedBuildInputs = [ From ba3b21dc062f5c474ebb97aee72c8b68b2a02173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 9 Feb 2022 21:24:47 +0000 Subject: [PATCH 33/82] python3Packages.pygraphviz: 1.8 -> 1.9 https://github.com/pygraphviz/pygraphviz/releases/tag/pygraphviz-1.9 --- pkgs/development/python-modules/pygraphviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 3c0552ef4d3c..3780122f19f7 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pygraphviz"; - version = "1.8"; + version = "1.9"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-6y4losZHBE57ZrWhWb5k2q7yS1Sfz1NcJBNp1ubgnEU="; + hash = "sha256-+hj3xs6ig0Gk5GbtDPBWgrCmgoiv6N18lCZ4L3wa4Bw="; extension = "zip"; }; From 626dc5f00a51f8f899536093f726dff6d978acf4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Feb 2022 16:23:55 +0100 Subject: [PATCH 34/82] python3Packages.warlock: enable tests --- .../python-modules/warlock/default.nix | 42 +++++++++++++++---- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix index 1b62c918f339..d0a192fcc57b 100644 --- a/pkgs/development/python-modules/warlock/default.nix +++ b/pkgs/development/python-modules/warlock/default.nix @@ -1,27 +1,51 @@ { lib , buildPythonPackage -, fetchPypi -, six +, fetchFromGitHub +, pythonOlder , jsonpatch , jsonschema -, jsonpointer +, six +, pytestCheckHook }: buildPythonPackage rec { pname = "warlock"; version = "1.3.3"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "a093c4d04b42b7907f69086e476a766b7639dca50d95edc83aef6aeab9db2090"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bcwaldon"; + repo = pname; + rev = version; + hash = "sha256-59V4KOwjs/vhA3F3E0j3p5L4JnKPgcExN+mgSWs0Cn0="; }; - propagatedBuildInputs = [ six jsonpatch jsonschema jsonpointer ]; + propagatedBuildInputs = [ + jsonpatch + jsonschema + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "jsonschema>=0.7,<4" "jsonschema" + sed -i "/--cov/d" pytest.ini + ''; + + pythonImportsCheck = [ + "warlock" + ]; meta = with lib; { - homepage = "https://github.com/bcwaldon/warlock"; description = "Python object model built on JSON schema and JSON patch"; + homepage = "https://github.com/bcwaldon/warlock"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; - } From b3dda0193ba5a4da744ffac6e3fe09b4e48f22e1 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 4 Feb 2022 12:07:14 +0100 Subject: [PATCH 35/82] opensnitch: 1.4.3 -> 1.5.0 --- pkgs/tools/networking/opensnitch/daemon.nix | 11 ++++----- pkgs/tools/networking/opensnitch/go-mod.patch | 24 ------------------- pkgs/tools/networking/opensnitch/ui.nix | 9 +++++-- 3 files changed, 12 insertions(+), 32 deletions(-) delete mode 100644 pkgs/tools/networking/opensnitch/go-mod.patch diff --git a/pkgs/tools/networking/opensnitch/daemon.nix b/pkgs/tools/networking/opensnitch/daemon.nix index 27d3a6ce5181..e636950cd981 100644 --- a/pkgs/tools/networking/opensnitch/daemon.nix +++ b/pkgs/tools/networking/opensnitch/daemon.nix @@ -10,17 +10,18 @@ , coreutils , iptables , makeWrapper +, protoc-gen-go-grpc }: buildGoModule rec { pname = "opensnitch"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "evilsocket"; repo = "opensnitch"; rev = "v${version}"; - sha256 = "1c2v2x8hfqk524sa42vry74lda4lg6ii40ljk2qx9j2f69446sva"; + sha256 = "sha256-vtD82v0VlaJtCICXduD3IxJ0xjlBuzGKLWLoCiwPX2I="; }; patches = [ @@ -31,17 +32,15 @@ buildGoModule rec { url = "https://github.com/evilsocket/opensnitch/commit/8a3f63f36aa92658217bbbf46d39e6d20b2c0791.patch"; sha256 = "sha256-WkwjKTQZppR0nqvRO4xiQoKZ307NvuUwoRx+boIpuTg="; }) - # Upstream has inconsistent vendoring - ./go-mod.patch ]; modRoot = "daemon"; buildInputs = [ libnetfilter_queue libnfnetlink ]; - nativeBuildInputs = [ pkg-config protobuf go-protobuf makeWrapper ]; + nativeBuildInputs = [ pkg-config protobuf go-protobuf makeWrapper protoc-gen-go-grpc ]; - vendorSha256 = "sha256-sTfRfsvyiFk1bcga009W6jD6RllrySRAU6B/8mF6+ow="; + vendorSha256 = "sha256-81BKMLuEXA/NeIjO7icBm48ROq6KxAxHtvP0nV5yM5A="; preBuild = '' make -C ../proto ../daemon/ui/protocol/ui.pb.go diff --git a/pkgs/tools/networking/opensnitch/go-mod.patch b/pkgs/tools/networking/opensnitch/go-mod.patch deleted file mode 100644 index 290e92ca755f..000000000000 --- a/pkgs/tools/networking/opensnitch/go-mod.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/daemon/go.mod b/daemon/go.mod -index ec21c04..a859bfb 100644 ---- a/daemon/go.mod -+++ b/daemon/go.mod -@@ -5,17 +5,12 @@ go 1.14 - require ( - github.com/evilsocket/ftrace v1.2.0 - github.com/fsnotify/fsnotify v1.4.7 -- github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect -- github.com/golang/protobuf v1.5.0 - github.com/google/gopacket v1.1.14 - github.com/google/nftables v0.0.0-20210514154851-a285acebcad3 - github.com/iovisor/gobpf v0.2.0 - github.com/vishvananda/netlink v1.1.0 -- github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect -- golang.org/x/net v0.0.0-20190311183353-d8887717615a -- golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 // indirect -- golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444 // indirect -- golang.org/x/text v0.3.0 // indirect -+ golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271 -+ golang.org/x/sys v0.0.0-20191029155521-f43be2a4598c - google.golang.org/grpc v1.27.0 - google.golang.org/protobuf v1.26.0 - ) diff --git a/pkgs/tools/networking/opensnitch/ui.nix b/pkgs/tools/networking/opensnitch/ui.nix index d211a10d2c5a..8c0b7686d8a7 100644 --- a/pkgs/tools/networking/opensnitch/ui.nix +++ b/pkgs/tools/networking/opensnitch/ui.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "opensnitch-ui"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "evilsocket"; repo = "opensnitch"; rev = "v${version}"; - sha256 = "sha256-amtDSDJOyNSxmJICEqN5lKhGyfF5C6I0EWViB1EXW7A="; + sha256 = "sha256-vtD82v0VlaJtCICXduD3IxJ0xjlBuzGKLWLoCiwPX2I="; }; nativeBuildInputs = [ @@ -26,6 +26,8 @@ python3Packages.buildPythonApplication rec { unidecode unicode-slugify pyinotify + notify2 + # pyasn # dpendency missing but not mandatory ]; preBuild = '' @@ -48,6 +50,9 @@ python3Packages.buildPythonApplication rec { dontWrapQtApps = true; makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ]; + # All tests are sandbox-incompatible and disabled for now + doCheck = false; + meta = with lib; { description = "An application firewall"; homepage = "https://github.com/evilsocket/opensnitch/wiki"; From beeabe61fecb28ede0f69c560a1b248c6a4684e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Feb 2022 11:18:17 +0000 Subject: [PATCH 36/82] python310Packages.glean-parser: 4.4.0 -> 5.0.1 --- pkgs/development/python-modules/glean-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 469c0d613b90..52fdf6745c9f 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "glean_parser"; - version = "4.4.0"; + version = "5.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3ae1435b183936a49368806421df27ab944f1802e86a02b38b8e08e53ff0aac5"; + sha256 = "sha256-MJ827VXy8e2CRyq4sY4d0B7etxBgRk4/hZybYOOLh9Q="; }; postPatch = '' From 47a61dcdf8a6d0bbb5e3af3620cee2172dc6fce7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Feb 2022 21:18:23 -0800 Subject: [PATCH 37/82] python3Packages.glean-sdk: 43.0.2 -> 44.0.0 --- pkgs/development/python-modules/glean-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index e52f2def3954..f2c2f92c9f0d 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -12,17 +12,17 @@ buildPythonPackage rec { pname = "glean-sdk"; - version = "43.0.2"; + version = "44.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9LLE7cUJhJ+0/rFtVkSdiXUohrXW0JFy3XcYMAAivfw="; + sha256 = "sha256-gzLsBwq3wrFde5cEb5+oFLW4KrwoiZpr22JbJhNr1yk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256:1qi7zn2278jpry466w3xj1wpyy5f82bffi55i6nva591i3r1z4am"; + sha256 = "sha256-lWFv8eiA3QHp5bhcg4qon/dvKUbFbtH1Q2oXGkk0Me0="; }; nativeBuildInputs = [ From 0f01c9892016bac57a8ff37627e14be922dd01ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Feb 2022 08:02:08 +0000 Subject: [PATCH 38/82] python310Packages.gipc: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/gipc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index a059495d00fe..2bab62fbcb10 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "gipc"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "a25ccfd2f8c94b24d2113fa50a0de5c7a44499ca9f2ab7c91c3bec0ed96ddeb1"; + sha256 = "sha256-P8d2GIxFAAHeXjXgIxKGwahiH1TW/9fE+V0f9Ra54wo="; }; propagatedBuildInputs = [ gevent ]; From 19ccd3a9888de5ddf9189a0b4e9644c9757080c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Feb 2022 04:22:26 +0000 Subject: [PATCH 39/82] python310Packages.trimesh: 3.9.43 -> 3.10.0 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 31459b2afb50..d4da6ee6928a 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.9.43"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "f7d4adf2df0fe19ea49c5f3268c33ffe28b3be818d280bb4c113d7463c58ddf9"; + sha256 = "sha256-mPsV25oD8FlPSDOGHOX+nLCN/I6RS83l3efUCgavmHY="; }; propagatedBuildInputs = [ numpy ]; From 20fb68ff55c2ebe869a2a51848aebbbe406cf92a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 10:29:09 +0100 Subject: [PATCH 40/82] python3Packages.discovery30303: init at 0.2.1 --- .../python-modules/discovery30303/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/discovery30303/default.nix diff --git a/pkgs/development/python-modules/discovery30303/default.nix b/pkgs/development/python-modules/discovery30303/default.nix new file mode 100644 index 000000000000..49de32439d12 --- /dev/null +++ b/pkgs/development/python-modules/discovery30303/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "discovery30303"; + version = "0.2.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + # Commit points to 0.2.1, https://github.com/bdraco/discovery30303/issues/1 + rev = "0d0b0fdca1a98662dd2e6174d25853703bd6bf07"; + hash = "sha256-WSVMhiJxASxAkxs6RGuAVvEFS8TPxDKE9M99Rp8HKGM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=discovery30303" "" + ''; + + pythonImportsCheck = [ + "discovery30303" + ]; + + meta = with lib; { + description = "Module to discover devices that respond on port 30303"; + homepage = "https://github.com/bdraco/discovery30303"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e05c11706df1..5ca5ec71115f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2176,6 +2176,8 @@ in { discordpy = callPackage ../development/python-modules/discordpy { }; + discovery30303 = callPackage ../development/python-modules/discovery30303 { }; + diskcache = callPackage ../development/python-modules/diskcache { }; dissononce = callPackage ../development/python-modules/dissononce { }; From 4d0e250a0c550e381f7f3a76e4b2e9b7db0079c4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 19:30:12 +0100 Subject: [PATCH 41/82] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 00af1e21899f..79e3cad867a1 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -835,7 +835,7 @@ "statistics" = ps: with ps; [ sqlalchemy ]; "statsd" = ps: with ps; [ statsd ]; "steam_online" = ps: with ps; [ ]; # missing inputs: steamodd - "steamist" = ps: with ps; [ aiohttp-cors ifaddr ]; # missing inputs: aiosteamist discovery30303 + "steamist" = ps: with ps; [ aiohttp-cors discovery30303 ifaddr ]; # missing inputs: aiosteamist "stiebel_eltron" = ps: with ps; [ pymodbus ]; # missing inputs: pystiebeleltron "stookalert" = ps: with ps; [ ]; # missing inputs: stookalert "stream" = ps: with ps; [ pyturbojpeg aiohttp-cors av ]; From fa88647993424af657aa8706df8489c4b3ecc05c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Feb 2022 00:11:26 +0100 Subject: [PATCH 42/82] python3Packages.aiosteamist: init at 0.3.1 --- .../python-modules/aiosteamist/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/aiosteamist/default.nix diff --git a/pkgs/development/python-modules/aiosteamist/default.nix b/pkgs/development/python-modules/aiosteamist/default.nix new file mode 100644 index 000000000000..aa7edc001de3 --- /dev/null +++ b/pkgs/development/python-modules/aiosteamist/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pythonOlder +, xmltodict +}: + +buildPythonPackage rec { + pname = "aiosteamist"; + version = "0.3.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + rev = version; + hash = "sha256-VoIJh3EDBPKmvEmM3gP2pyt/0oz4i6Y0zIkkprTcFLg="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + xmltodict + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov=aiosteamist" "" + ''; + + pythonImportsCheck = [ + "aiosteamist" + ]; + + # Modules doesn't have test suite + doCheck = false; + + meta = with lib; { + description = "Module to control Steamist steam systems"; + homepage = "https://github.com/bdraco/aiosteamist"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ca5ec71115f..6362ab190805 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -408,6 +408,8 @@ in { aiosqlite = callPackage ../development/python-modules/aiosqlite { }; + aiosteamist = callPackage ../development/python-modules/aiosteamist { }; + aiostream = callPackage ../development/python-modules/aiostream { }; aioswitcher = callPackage ../development/python-modules/aioswitcher { }; From c3c21de26bc33ec5ff6228e621cebbbe3c2c0b8c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Feb 2022 00:13:30 +0100 Subject: [PATCH 43/82] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 79e3cad867a1..1f0730865fae 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -835,7 +835,7 @@ "statistics" = ps: with ps; [ sqlalchemy ]; "statsd" = ps: with ps; [ statsd ]; "steam_online" = ps: with ps; [ ]; # missing inputs: steamodd - "steamist" = ps: with ps; [ aiohttp-cors discovery30303 ifaddr ]; # missing inputs: aiosteamist + "steamist" = ps: with ps; [ aiohttp-cors aiosteamist discovery30303 ifaddr ]; "stiebel_eltron" = ps: with ps; [ pymodbus ]; # missing inputs: pystiebeleltron "stookalert" = ps: with ps; [ ]; # missing inputs: stookalert "stream" = ps: with ps; [ pyturbojpeg aiohttp-cors av ]; @@ -1507,6 +1507,7 @@ "startca" "statistics" "statsd" + "steamist" "stream" "stt" "subaru" From 5fe1d1c1ba63803c0637bde6e544bcb9527c86fe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Feb 2022 08:43:48 +0100 Subject: [PATCH 44/82] python3Packages.pywemo: 0.7.0 -> 0.8.0 --- pkgs/development/python-modules/pywemo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix index 1e2f8db96cd8..15545acf2f63 100644 --- a/pkgs/development/python-modules/pywemo/default.nix +++ b/pkgs/development/python-modules/pywemo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pywemo"; - version = "0.7.0"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-NwhKrk5cQT7kk4VCr0BMQz0yTP/vuBA6MjTRuk2LM5Y="; + hash = "sha256-bGoqhrjoRKUGPBNfmr2XP+1HL5mdRi6XoCi0BdvY9x8="; }; nativeBuildInputs = [ From 3bf56677f3ff7bb3140051602ac55e6ab570ed87 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Feb 2022 08:57:20 +0100 Subject: [PATCH 45/82] python3Packages.google-nest-sdm: 1.6.0 -> 1.7.0 --- .../python-modules/google-nest-sdm/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 2b076f4cae02..227d49d57dbb 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "1.6.0"; + version = "1.7.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = version; - sha256 = "sha256-qgowVCsSNa+Gt+fWnR1eMfkbtpZD7DS4ALZYz6KZZTM="; + sha256 = "sha256-SDxYPncC/VVTbI4Ka/mgcVfU1KUNRXVvQl78LCoD/RQ="; }; propagatedBuildInputs = [ @@ -44,17 +44,17 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace tests/event_media_test.py \ - --replace "/bin/echo" "${coreutils}/bin/echo" - ''; - pythonImportsCheck = [ "google_nest_sdm" ]; + disabledTests = [ + "test_clip_preview_transcode" + "test_event_manager_event_expiration_with_transcode" + ]; + meta = with lib; { - description = "Python module for Google Nest Device Access using the Smart Device Management API"; + description = "Module for Google Nest Device Access using the Smart Device Management API"; homepage = "https://github.com/allenporter/python-google-nest-sdm"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; From fda49570ba6153cb01ffe6dec30416090cbb51b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 05:56:34 +0000 Subject: [PATCH 46/82] tfsec: 1.1.2 -> 1.1.3 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 0a001ca50cd5..c6e9ca39128e 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RoXk/wzizlND+WuFy5ZFfryKC9vS31b6SgZH7dPt3Ds="; + sha256 = "sha256-pJyITEIngSWTDGfCcm8Z6YD6Pkbum0Vk71hqWk+CnUc="; }; goPackagePath = "github.com/aquasecurity/tfsec"; From f84d2b39043138efd149bf789b97fe9574711fe4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 06:37:32 +0000 Subject: [PATCH 47/82] python310Packages.ovoenergy: 1.1.12 -> 1.2.0 --- pkgs/development/python-modules/ovoenergy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ovoenergy/default.nix b/pkgs/development/python-modules/ovoenergy/default.nix index 42615fa664dd..e8a7840d3162 100644 --- a/pkgs/development/python-modules/ovoenergy/default.nix +++ b/pkgs/development/python-modules/ovoenergy/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ovoenergy"; - version = "1.1.12"; + version = "1.2.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "timmo001"; repo = pname; rev = "v${version}"; - sha256 = "1430k699gblxwspsbgxnha8afk6npqharhz2jyjw5gir9pi6g9cz"; + sha256 = "sha256-OSK74uvpHuEtWgbLVFrz1NO7lvtHbt690smGQ+GlsOI="; }; propagatedBuildInputs = [ From d96fbda83c6e73c4c8b5d49ec0002b5634461e27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 07:08:57 +0000 Subject: [PATCH 48/82] python310Packages.sendgrid: 6.9.5 -> 6.9.6 --- pkgs/development/python-modules/sendgrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index 4b1d79d0e572..c9b6d7c96808 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.9.5"; + version = "6.9.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "1r8xh0c6wivrajj6gl1hv25vsb9i79n19nd4x53207i5vz9d55g5"; + sha256 = "sha256-6MkAtkbKVoa8UatG92RzbCdAM+WsQN2WnOIh4pRoUVk="; }; propagatedBuildInputs = [ From ce3082a02d7c1ea0bc8ddaacaa10243b05f6132b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 00:51:31 +0000 Subject: [PATCH 49/82] python310Packages.types-requests: 2.27.8 -> 2.27.9 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index c45b25329892..06f92bdc41ee 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.8"; + version = "2.27.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wvTkdU0HygqI/YqJu8bIqfkPtEH5ybVy/VxITwSBdIY="; + sha256 = "sha256-c2iXRTTSl5OUku/f2rIykwRAsR4iA/bfHwxA4yQqh+o="; }; propagatedBuildInputs = [ From 49c657c60c4084242959a506aca7b2a686474935 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 18 Jan 2022 12:37:52 +0100 Subject: [PATCH 50/82] chipsec: 1.6.1 -> 1.8.0 --- pkgs/tools/security/chipsec/default.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index fbb9c421e353..31c26616591f 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -10,14 +10,15 @@ python3.pkgs.buildPythonApplication rec { pname = "chipsec"; - version = "1.6.1"; + version = "1.8.0"; + disabled = !stdenv.isLinux; src = fetchFromGitHub { owner = "chipsec"; repo = "chipsec"; rev = version; - sha256 = "01sp24z63r3nqxx57zc4873b8i5dqipy7yrxzrwjns531vznhiy2"; + hash = "sha256-6Wzh1cEQoVl4FSlqni1bRbVWZIjovaAMeozuxKvvSqA="; }; patches = lib.optionals withDriver [ ./ko-path.diff ./compile-ko.diff ]; @@ -29,9 +30,9 @@ python3.pkgs.buildPythonApplication rec { nasm ]; - checkInputs = [ - python3.pkgs.distro - python3.pkgs.pytestCheckHook + checkInputs = with python3.pkgs; [ + distro + pytestCheckHook ]; preBuild = lib.optionalString withDriver '' @@ -45,10 +46,15 @@ python3.pkgs.buildPythonApplication rec { $out/${python3.pkgs.python.sitePackages}/drivers/linux/chipsec.ko ''; - setupPyBuildFlags = [ "--build-lib=$CHIPSEC_BUILD_LIB" ] - ++ lib.optional (!withDriver) "--skip-driver"; + setupPyBuildFlags = [ + "--build-lib=$CHIPSEC_BUILD_LIB" + ] ++ lib.optional (!withDriver) [ + "--skip-driver" + ]; - pythonImportsCheck = [ "chipsec" ]; + pythonImportsCheck = [ + "chipsec" + ]; meta = with lib; { description = "Platform Security Assessment Framework"; From 96ff7e3676c434f65981ad536ee547eb4efad003 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Feb 2022 08:24:36 +0100 Subject: [PATCH 51/82] chipsec: 1.8.0 -> 1.8.1 --- pkgs/tools/security/chipsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index 31c26616591f..64d8885eedd4 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "chipsec"; - version = "1.8.0"; + version = "1.8.1"; disabled = !stdenv.isLinux; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { owner = "chipsec"; repo = "chipsec"; rev = version; - hash = "sha256-6Wzh1cEQoVl4FSlqni1bRbVWZIjovaAMeozuxKvvSqA="; + hash = "sha256-bK8wlwhP0pi8rOs8ysbSZ+0aZOaX4mckfH/p4OLGnes="; }; patches = lib.optionals withDriver [ ./ko-path.diff ./compile-ko.diff ]; From 1cc5f88b2bf40ed9a6bfe73ecc97b381b2d8d84d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Feb 2022 08:37:54 +0100 Subject: [PATCH 52/82] checkov: 2.0.814 -> 2.0.817 --- 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 01d857187a3e..1b609545ad2f 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,13 +22,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.814"; + version = "2.0.817"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-imKVX88QvI+2/x5C8s7yBAg7kFe2JBEdjdH/fWgISyo="; + hash = "sha256-pPPP6nzzIy+CS8TftD1M7BT+eG1KmiM0d79RnqqdiDw="; }; nativeBuildInputs = with py.pkgs; [ From ab23d81e1ce9319444fa21b70af0ee0a97700a16 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Feb 2022 08:44:48 +0100 Subject: [PATCH 53/82] kubescape: 2.0.144 -> 2.0.146 --- pkgs/tools/security/kubescape/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 9adf63ea160f..338e00d79d19 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "kubescape"; - version = "2.0.144"; + version = "2.0.146"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - hash = "sha256-X/r39lvNSLZ4SG/x5Woj7c0fEOp8USyeTWYihaY0faU="; + hash = "sha256-OSpT6S0jCw/svWl4q9CyZUwUB/cFAyiyWt+oXKVPSJ0="; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-gB1/WkGC3sgMqmA4F9/dGU0R0hIDwwTVBNNsY6Yj8KU="; + vendorSha256 = "sha256-p2bLZfwsSevaiAqciCfEvpdOx3WlVdWBHVXtLBMjLGA="; ldflags = [ "-s" From ac7c47f64bbd7b12deeea53996ce19d1e95535b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Feb 2022 08:50:58 +0100 Subject: [PATCH 54/82] python3Packages.decopatch: 1.4.8 -> 1.4.9 --- .../python-modules/decopatch/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/decopatch/default.nix b/pkgs/development/python-modules/decopatch/default.nix index 7fa3c6465db4..92c2c27de2f6 100644 --- a/pkgs/development/python-modules/decopatch/default.nix +++ b/pkgs/development/python-modules/decopatch/default.nix @@ -3,31 +3,42 @@ , fetchPypi , makefun , setuptools-scm +, pythonOlder }: buildPythonPackage rec { pname = "decopatch"; - version = "1.4.8"; + version = "1.4.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0i6i811s2j1z0cl6y177dwsbfxib8dvb5c2jpgklvc2xy4ahhsy6"; + hash = "sha256-tYgsjPDVsB0hi04E9nYtB7ModCDqUJcG9Zlxw9b+xW8="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - propagatedBuildInputs = [ makefun ]; + propagatedBuildInputs = [ + makefun + ]; postPatch = '' - substituteInPlace setup.py --replace "'pytest-runner', " "" + substituteInPlace setup.cfg \ + --replace "pytest-runner" "" ''; + pythonImportsCheck = [ + "decopatch" + ]; + # Tests would introduce multiple cirucular dependencies # Affected: makefun, pytest-cases doCheck = false; - pythonImportsCheck = [ "decopatch" ]; - meta = with lib; { description = "Python helper for decorators"; homepage = "https://github.com/smarie/python-decopatch"; From d94275b0138f638d7a5cdacdb2bd42056500af78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 08:03:38 +0000 Subject: [PATCH 55/82] klipper: unstable-2022-01-09 -> unstable-2022-02-07 --- pkgs/servers/klipper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 48d6118add95..fd80dc4b87c6 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2022-01-09"; + version = "unstable-2022-02-07"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "6e6ad7b5201d3452aa605f4ae852c51239c2c7d8"; - sha256 = "sha256-cflcGweEjB0xj2LhYJzyvqFSQen2vhYXlL7lz/HoGaM="; + rev = "6d7c03365ad13c4661675aaccd0a3dc5be544493"; + sha256 = "sha256-xFSZkOFETGcJXA6CUCReoyNZXhDAfgKkWoeDRqueBVw="; }; sourceRoot = "source/klippy"; From 5a81f63bd2ce2b068881ea6bb2293ca068dcc532 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 08:10:51 +0000 Subject: [PATCH 56/82] python310Packages.nltk: 3.6.7 -> 3.7 --- pkgs/development/python-modules/nltk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 27e17daa372a..90433a37334c 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "3.6.7"; + version = "3.7"; pname = "nltk"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "51bf1aef5304740a708be7c8e683f7798f03dc5c7a7e7feb758be9e95f4585e3"; + sha256 = "sha256-1lB9ZGDOx21wr+pCQqImp1QvhcZpF3ucf1YrfPGwVQI="; }; propagatedBuildInputs = [ From ade08f80fc32dab5fd7dce5dd99e77871c4f797a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 08:12:26 +0000 Subject: [PATCH 57/82] lagrange: 1.10.3 -> 1.10.4 --- pkgs/applications/networking/browsers/lagrange/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 482914ace0a5..4285ee3298b8 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.10.3"; + version = "1.10.4"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-4Xjm4P4uK0aZxUT0WzcSDdY6rEeh5YFwsMfVtFB14No="; + sha256 = "sha256-tj/RDGPu1hB67eTdq7NrbRd+OwBhIAm1lBgoft5m4v4="; fetchSubmodules = true; }; From f03db70a88eb8745b9e405cc8a7536a613327ce4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 08:20:08 +0000 Subject: [PATCH 58/82] swayr: 0.12.1 -> 0.13.0 --- pkgs/tools/wayland/swayr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix index b6de504be8a4..c1bcf3b4e9f0 100644 --- a/pkgs/tools/wayland/swayr/default.nix +++ b/pkgs/tools/wayland/swayr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayr"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "v${version}"; - sha256 = "sha256-xcpgebGyYJep4vSdBb0OXhX66DGA7w3B5KYOHj8BKKM="; + sha256 = "sha256-V4ETsraJo9X10fPMGSuiokPiSlZGYHncOdfheGom1go="; }; - cargoSha256 = "sha256-CYavcHLIQKEh1SoELevAa6g0Q2nksWwcS7/syK4oYq0="; + cargoSha256 = "sha256-3ErzkS8u+4Ve26jpDbsYr4BVDm/XEgydYdZ2ErtVuVA="; patches = [ ./icon-paths.patch From a62a6a33d12709d4200e084e90f227bf16fd5dfd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Feb 2022 09:31:23 +0100 Subject: [PATCH 59/82] python3Packages.aioaseko: 0.0.1 -> 0.0.2 --- pkgs/development/python-modules/aioaseko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioaseko/default.nix b/pkgs/development/python-modules/aioaseko/default.nix index ca05910511ed..1c31dac5f596 100644 --- a/pkgs/development/python-modules/aioaseko/default.nix +++ b/pkgs/development/python-modules/aioaseko/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioaseko"; - version = "0.0.1"; + version = "0.0.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "milanmeu"; repo = pname; rev = "v${version}"; - hash = "sha256-dfU2J4aDKNR+GoEmdq/NhX4Mrmm9tmCkse1tb+V5EFQ="; + hash = "sha256-nJRVNBYfBcLYnBsTpQZYMHYWh0+hQObVKJ7sOXFwDjc="; }; propagatedBuildInputs = [ From 366f637cb62d594d57f84ebe40c62261b36cf7c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Feb 2022 09:34:32 +0100 Subject: [PATCH 60/82] python3Packages.cloudsplaining: 0.4.10 -> 0.5.0 --- pkgs/development/python-modules/cloudsplaining/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix index 13720f9d88bc..20d822d8ee77 100644 --- a/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/pkgs/development/python-modules/cloudsplaining/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.4.10"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = pname; rev = version; - hash = "sha256-zTsqrHu8eQsQ4ZFocvHdVsgCjWE6JVrlyaztFNir2fk="; + hash = "sha256-HdZHRK/Q544z9ySbjNIjqiXzel0UTsnb9tuXawbkwZg="; }; propagatedBuildInputs = [ From 4f087c5833e7fc857b94f39c99be15656a239bc7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Feb 2022 09:49:46 +0100 Subject: [PATCH 61/82] python3Packages.identify: 2.4.8 -> 2.4.9 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index d5805e94e794..b4bd659f9872 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.4.8"; + version = "2.4.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MrlFTUNisT5VG8IUIk/qejkM7tV6qrU4ASBzAUCLWpQ="; + sha256 = "sha256-4pFkysb0gxgb1oYirTnvQgjEStJkzUn0Ktw33ZP7zA4="; }; checkInputs = [ From 0cbb1a70e1f24b3022ad77c3e65d2ade2d7f3dd1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Feb 2022 10:06:30 +0100 Subject: [PATCH 62/82] python3Packages.tmb: 0.1.1 -> 0.1.3 --- .../python-modules/tmb/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/tmb/default.nix b/pkgs/development/python-modules/tmb/default.nix index 72d9604e8689..10a6e3b00d50 100644 --- a/pkgs/development/python-modules/tmb/default.nix +++ b/pkgs/development/python-modules/tmb/default.nix @@ -2,30 +2,39 @@ , buildPythonPackage , fetchFromGitHub , requests +, pythonOlder }: buildPythonPackage rec { pname = "tmb"; - version = "0.1.1"; + version = "0.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "alemuro"; repo = pname; rev = version; - sha256 = "sha256-xwzaJuiQxExUA5W4kW7t1713S6NOvDNagcD3/dwA+DE="; + hash = "sha256-/syHSu9LKLDe3awrgSIHh0hV+raWqKd53f43WagHn9c="; }; VERSION = version; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; + + pythonImportsCheck = [ + "tmb" + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "tmb" ]; meta = with lib; { - homepage = "https://github.com/alemuro/tmb"; description = "Python library that interacts with TMB API"; + homepage = "https://github.com/alemuro/tmb"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 34e964f44cc970c9d2b87c203729ada5a92ea693 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 10 Feb 2022 08:22:27 +1000 Subject: [PATCH 63/82] cri-o: 1.22.1 -> 1.23.0 https://github.com/cri-o/cri-o/releases/tag/v1.23.0 --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 75a3dbf37462..36ce5c3ade28 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.22.1"; + version = "1.23.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-x1bnDksmEjKuzjwPBENP9xpQbzo8HAW+0i2l2Ra/48Y="; + sha256 = "sha256-F6eWC1GhPJRyra7U80tBxfokY1PIJmsuF3H9536tPxA="; }; vendorSha256 = null; From cc04e93dd65092c795b4c4d44544062c606642a6 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 10 Feb 2022 08:24:47 +1000 Subject: [PATCH 64/82] buildah: 1.23.1 -> 1.24.1 https://github.com/containers/buildah/releases/tag/v1.24.0 https://github.com/containers/buildah/releases/tag/v1.24.1 --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 04ab489da1cc..ec3f4de5e11e 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.23.1"; + version = "1.24.1"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-vAuUA51E1pufn3YvNe4yfqJHXo14iUEA5MzP3/ah+8I="; + sha256 = "sha256-Dl1ZTYzwZ3tl5k9uPnnKHObmTP6Xsw0P1LdPqCfd/d0="; }; outputs = [ "out" "man" ]; From 589712910b141cfa97ddb69969d302bde2f2058f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 09:14:53 +0000 Subject: [PATCH 65/82] symfony-cli: 5.3.0 -> 5.3.3 --- pkgs/development/tools/symfony-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index d40eddf12f0e..5b084aaad3ef 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.3.0"; + version = "5.3.3"; vendorSha256 = "sha256-i4p9kEe0eT2L4U/DjkWlLVqgGT5ZJaoGyFAoYyxmoyI="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-bZPoHVYso2BEEZO4FXubxOtGCIJyX77Ll0qut5sJjUA="; + sha256 = "sha256-qLgcv6vjPiNJZuZzW0mSKxySz0GdNALtyZ6E3fL3B6Y="; }; # Tests requires network access From 7b5df31d50e6764d2a97f012185173325a992e6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 09:25:03 +0000 Subject: [PATCH 66/82] mold: 1.0.2 -> 1.0.3 --- pkgs/development/tools/mold/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 8d088a6d2860..6de56fb47058 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0TXk+6hS6TJHwhowYzL8ABw3iyfVwPttJWKQ9RfzMSI="; + sha256 = "sha256-L/io0kMYkFVSmOiH6sM/CoibE1rPRwDM0fFddw6kM+4="; }; buildInputs = [ zlib openssl ]; From 420ac8883feeee23528f13b578c980520329262f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 09:32:19 +0000 Subject: [PATCH 67/82] svgbob: 0.6.2 -> 0.6.3 --- pkgs/tools/graphics/svgbob/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index 2e3740dabb7c..9afb6682ba55 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "svgbob"; - version = "0.6.2"; + version = "0.6.3"; src = fetchCrate { inherit version; crateName = "svgbob_cli"; - sha256 = "sha256-9JASoUN/VzZS8ihepTQL2SXZitxKBMSJEv+13vzQd3w="; + sha256 = "sha256-yYRBV0s19J0M02wenGayy7Ebx6wDhiLiGmb+os29u9I="; }; - cargoSha256 = "sha256-pkdiow+9gsQ9rrSHwukd17r5CfsaJgYj6KA4wYKbtA0="; + cargoSha256 = "sha256-R4W+Oe7Ks2D9qE1IpV6/AMMMwZnCfJ5DzxFAMpV2rFE="; meta = with lib; { description = "Convert your ascii diagram scribbles into happy little SVG"; From edf79a49adfac00c3582d1e21cc9fd0d9152f648 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Feb 2022 10:13:37 +0100 Subject: [PATCH 68/82] python3Packages.httpx-ntlm: 0.0.10 -> 1.0.0 --- .../python-modules/httpx-ntlm/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/httpx-ntlm/default.nix b/pkgs/development/python-modules/httpx-ntlm/default.nix index b3ac17cf7f07..40ef250401bf 100644 --- a/pkgs/development/python-modules/httpx-ntlm/default.nix +++ b/pkgs/development/python-modules/httpx-ntlm/default.nix @@ -3,29 +3,35 @@ , cryptography , fetchPypi , httpx -, ntlm-auth +, pyspnego +, pythonOlder }: buildPythonPackage rec { pname = "httpx-ntlm"; - version = "0.0.10"; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "httpx_ntlm"; inherit version; - sha256 = "1rar6smz56y8k5qbgrpabpr639nwvf6whdi093hyakf0m3h9cpfz"; + sha256 = "sha256-pv/OxgcO0JWk2nCZp+bKlOdX7NqV6V5xZRDy5dd13qQ="; }; propagatedBuildInputs = [ cryptography httpx - ntlm-auth + pyspnego ]; # https://github.com/ulodciv/httpx-ntlm/issues/5 doCheck = false; - pythonImportsCheck = [ "httpx_ntlm" ]; + pythonImportsCheck = [ + "httpx_ntlm" + ]; meta = with lib; { description = "NTLM authentication support for HTTPX"; From 1fd231a86f027ca229acd7298deba6f77fcc8693 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Feb 2022 11:44:45 +0100 Subject: [PATCH 69/82] python3Packages.intellifire4py: 0.7.3 -> 0.9.7 --- pkgs/development/python-modules/intellifire4py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index cd8dfe3fb6fb..bc33a2389164 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "0.7.3"; + version = "0.9.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jeeftor"; repo = pname; rev = version; - hash = "sha256-vOARk7TZrpsJLt8Ofur1NxknejmmxmH4Z+30mev4++o="; + hash = "sha256-cNWsKwXVlnZgPjkll1IaEhDHfHNvWCBY6U3B34IdHd0="; }; propagatedBuildInputs = [ From 28486b2af825ce49184f8f6898c2a377b9f58470 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 9 Feb 2022 10:32:43 +0800 Subject: [PATCH 70/82] garage: init at 0.6.0 --- pkgs/tools/filesystems/garage/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/filesystems/garage/default.nix diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix new file mode 100644 index 000000000000..fbeac15a38e2 --- /dev/null +++ b/pkgs/tools/filesystems/garage/default.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitea, testVersion, garage }: +rustPlatform.buildRustPackage rec { + pname = "garage"; + version = "0.6.0"; + + src = fetchFromGitea { + domain = "git.deuxfleurs.fr"; + owner = "Deuxfleurs"; + repo = "garage"; + rev = "v${version}"; + sha256 = "sha256-NNjqDOkMMRyXce+Z7RQpuffCuVhA1U3qH30rSv939ks="; + }; + + cargoSha256 = "sha256-eKJxRcC43D8qVLORer34tlmsWhELTbcJbZLyf0MB618="; + + passthru = { + tests.version = testVersion { package = garage; }; + }; + + meta = { + description = "S3-compatible object store for small self-hosted geo-distributed deployments"; + homepage = "https://garagehq.deuxfleurs.fr"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ nickcao _0x4A6F ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 637462d344f8..ccf7ba4fee93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5587,6 +5587,8 @@ with pkgs; gaphor = python3Packages.callPackage ../tools/misc/gaphor { }; + garage = callPackage ../tools/filesystems/garage { }; + garmin-plugin = callPackage ../applications/misc/garmin-plugin {}; garmintools = callPackage ../development/libraries/garmintools {}; From 397138f36cfed4eb4ed2f4a4c1abd18bdcf21799 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Feb 2022 13:07:33 +0100 Subject: [PATCH 71/82] python3Packages.nltk: add pythonImportsCheck --- .../python-modules/nltk/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 90433a37334c..9beeb4cb0a69 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -1,4 +1,7 @@ -{ fetchPypi, buildPythonPackage, lib, isPy3k +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder , click , joblib , regex @@ -6,13 +9,16 @@ }: buildPythonPackage rec { - version = "3.7"; pname = "nltk"; + version = "3.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-1lB9ZGDOx21wr+pCQqImp1QvhcZpF3ucf1YrfPGwVQI="; + hash = "sha256-1lB9ZGDOx21wr+pCQqImp1QvhcZpF3ucf1YrfPGwVQI="; }; propagatedBuildInputs = [ @@ -30,10 +36,14 @@ buildPythonPackage rec { # best. doCheck = false; - meta = { + pythonImportsCheck = [ + "nltk" + ]; + + meta = with lib; { description = "Natural Language Processing ToolKit"; homepage = "http://nltk.org/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ lheckemann ]; + license = licenses.asl20; + maintainers = with maintainers; [ lheckemann ]; }; } From fb12f39f36fa5e27946613d275d2df73743434e1 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 10 Feb 2022 13:13:03 +0100 Subject: [PATCH 72/82] ddcutil: 1.2.1 -> 1.2.2 --- pkgs/tools/misc/ddcutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 0a956a325197..9ee56a2d509a 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "sha256-mIYxGoITaFlHgqAfB6ZZFR3spGD0BElJZJJqFGM4r/I="; + sha256 = "0hbd2ybpqmm96icg387vr57dqkdbc20vyimqjq5yx0sdlp4ikzi7"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 294dfd1679c97631050e8dc80d3486b69f18b6e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 12:14:24 +0000 Subject: [PATCH 73/82] qownnotes: 22.2.1 -> 22.2.2 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 37099496b666..7cac4baefafc 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.2.1"; + version = "22.2.2"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "26dfd41430e9efa5cc93c2d67156387a564efd0843c2020284658100b298d54c"; + sha256 = "sha256-b2yoy1WhnPTE2fNeHVvkwKLzjeaSBhHiQgSZ9VHwkGY="; }; nativeBuildInputs = [ qmake qttools ]; From 139720e56bbf950d1bee38fc46e9731bb3ff03af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Feb 2022 13:34:40 +0100 Subject: [PATCH 74/82] checkov: 2.0.817 -> 2.0.820 --- 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 1b609545ad2f..98b492a9b92d 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,13 +22,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.817"; + version = "2.0.820"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-pPPP6nzzIy+CS8TftD1M7BT+eG1KmiM0d79RnqqdiDw="; + hash = "sha256-qvYg4tXq9RTYj+pbxg0fZRkTGP8/pk22K9wqMNxVHTo="; }; nativeBuildInputs = with py.pkgs; [ From 4874c253e721d76bbdbc526cd0996a8de17ef297 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 10 Feb 2022 04:41:38 -0800 Subject: [PATCH 75/82] vector: 0.19.1 -> 0.19.2 (#158878) --- pkgs/tools/misc/vector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 468fa433e846..af484d9f3c23 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -29,7 +29,7 @@ let pname = "vector"; - version = "0.19.1"; + version = "0.19.2"; in rustPlatform.buildRustPackage { inherit pname version; @@ -38,10 +38,10 @@ rustPlatform.buildRustPackage { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ty+tsT3nkdYN7/avG1imIwWKAmtPA3NPjhrtoADciQs="; + sha256 = "sha256-fTi9Xu/abQAiVCokfieJUgAtPaqUKw6LJQFqMBoW5yc="; }; - cargoSha256 = "sha256-dYIAbjBBnEsCGt5ceV+jG0hsu8dcAH4V+wnfm6Chw8Q="; + cargoSha256 = "sha256-1bxlO9vuNuPLTLhXwcR6mgOpZwFgdXvGVps5b5ioKJc="; nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; From 6cf4fe1ed6397ffa4686c95b2238725f9d0b95bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 10 Feb 2022 04:47:15 -0800 Subject: [PATCH 76/82] reviewdog: 0.13.0 -> 0.13.1 (#158599) --- pkgs/development/tools/misc/reviewdog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index b39ab68f06c0..5a532d79f2bd 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-PneUN59ddYvhVIXqZeDCh0tWADkRTU9Dj0HNf0V8s3g="; + sha256 = "sha256-IBAJePrqliriOkZRWLAU7hllpGr4DVs8rzD2yyOXZzM="; }; - vendorSha256 = "sha256-NI5pzKfUTjXqDukeQ1wFN/D0TBeXfDPGL69oEL7reCE="; + vendorSha256 = "sha256-6TBurIWct6k4X+0lZ9FYgTc+DQgTpEIS7HUr0V7n++I="; doCheck = false; From bec8378a30ca49cac4ce1ff2d524aafe3c85c731 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 10 Feb 2022 14:07:31 +0100 Subject: [PATCH 77/82] pythonPackages.libusb1: 2.0.1 -> 3.0.0 --- pkgs/development/python-modules/libusb1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index f1b474b960f6..da84d890eced 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libusb1"; - version = "2.0.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d3ba82ecf7ab6a48d21dac6697e26504670cc3522b8e5941bd28fb56cf3f6c46"; + sha256 = "5792a9defee40f15d330a40d9b1800545c32e47ba7fc66b6f28f133c9fcc8538"; }; postPatch = '' From 2310213ab2c8e00c931d60cd32f6bc1ecf1a1f15 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 10 Feb 2022 06:02:05 -0800 Subject: [PATCH 78/82] wrangler: 1.19.7 -> 1.19.8 (#158551) --- pkgs/development/tools/wrangler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index a6c2b6db9730..fba7d96c1da2 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.19.7"; + version = "1.19.8"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1Bb4vpmWtSW2E2gr6V+tDsc4P5FJfCLLpzQX2WiVzUg="; + sha256 = "sha256-vJjAN7RmB1J4k7p2emfbjJxkpfph6piinmqVTR67HW0="; }; - cargoSha256 = "sha256-iAlRdUMR+64ngRT4icY6sTFFeRt4aShV/hj8PXJ0kEk="; + cargoSha256 = "sha256-dDQvcYnceBPDc+yeePjZ1k4a2ujCSh1hJMYFjPGw/bE="; nativeBuildInputs = [ pkg-config ]; From 6047d30682d1e558d70770e96a5b0a4fc268b68e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 10 Feb 2022 06:05:19 -0800 Subject: [PATCH 79/82] wike: 1.7.0 -> 1.7.1 (#158542) --- pkgs/applications/misc/wike/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/wike/default.nix b/pkgs/applications/misc/wike/default.nix index ef4a0ab7e59d..0193321ef4be 100644 --- a/pkgs/applications/misc/wike/default.nix +++ b/pkgs/applications/misc/wike/default.nix @@ -14,13 +14,13 @@ let ]); in stdenv.mkDerivation rec { pname = "wike"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "hugolabe"; repo = "Wike"; rev = version; - sha256 = "sha256-Cv4gmAUqViHJEAgueLOUX+cI775QopfRA6vmHgQvCUY="; + sha256 = "sha256-QLhfzGRrc2En0Hu+UdtPM572PdtXqOFL0W3LoAki4jI="; }; nativeBuildInputs = [ From ffa68dd65ef76012af3edfcc7e1a415bf9ada2ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 10 Feb 2022 06:17:29 -0800 Subject: [PATCH 80/82] step-ca: 0.18.0 -> 0.18.1 (#158442) --- pkgs/tools/security/step-ca/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index d403d7283171..97a42646312e 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = "sha256-f9sp5sAWysOOoIdCiCJxTWRhyt0wfpO5p4pxW6jj0xc="; + sha256 = "sha256-oebmJ+xrJTV5gXH3U1lWCSQMHiVnUTa0ZTp39sVB7KM="; }; - vendorSha256 = "sha256-iDfPCRU91cuZsKqNOjkLGYmWf8i5FO4NmDsfD5Xqip0="; + vendorSha256 = "sha256-IJXJS+Z93Hw1I1CAeRv4mq8as9DKebqNFa0IMgZ+Kic="; ldflags = [ "-buildid=" ]; From 41badc55c6296552391bd8e2b5adb3e64c1d2f71 Mon Sep 17 00:00:00 2001 From: Seong Yong-ju Date: Mon, 24 Jan 2022 20:46:49 +0900 Subject: [PATCH 81/82] sumneko-lua-language-server: 2.6.0 -> 2.6.4 --- .../development/tools/sumneko-lua-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index ee75f2e081bc..99b51854e7d4 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "2.6.0"; + version = "2.6.4"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-8Vfk6B85anlUf09cc08hOGujbcVCMqgEJ1PTxX6llrk="; + sha256 = "sha256-oUIgEWLcpEZHtL1wvTAezLtz2PecddtwhzbLhGqso/k="; fetchSubmodules = true; }; From 94edc09ac9c7cc11cbbd03b2ae7553b737d6b959 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Feb 2022 16:21:53 +0000 Subject: [PATCH 82/82] python310Packages.connexion: 2.10.0 -> 2.11.1 --- pkgs/development/python-modules/connexion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index bfe4fc221445..465bee6664df 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "connexion"; - version = "2.10.0"; + version = "2.11.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "zalando"; repo = pname; rev = version; - sha256 = "sha256-a1wj72XpjXvhWCxRLrGeDatS8a4ij9YAm9FGhTBq/i8="; + sha256 = "sha256-m/r09VNp/AMssOJH9RKMhPcObGHl9uIAoS1PwrjpKaE="; }; propagatedBuildInputs = [