From fcc47aec15d3eea8fc1fe685bb5efa1b4af37467 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 14 Aug 2022 10:12:20 +0200 Subject: [PATCH] collectd: unpin libsigrok The pinning of `libsigrok` was introduced in 300e49510124 for `collectd-5.5.1`. It is now at 5.12.0 and the pinning seems outdated. --- pkgs/top-level/all-packages.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ff8d0d543c9..c4d018cdf1ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5004,7 +5004,6 @@ with pkgs; convertlit = callPackage ../tools/text/convertlit { }; collectd = callPackage ../tools/system/collectd { - libsigrok = libsigrok_0_3; # not compatible with >= 0.4.0 yet jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 inherit (darwin.apple_sdk.frameworks) IOKit; }; @@ -15856,13 +15855,6 @@ with pkgs; libsigrok = callPackage ../development/tools/libsigrok { python = python3; }; - # old version: - libsigrok_0_3 = libsigrok.override { - python = python3; - version = "0.3.0"; - sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3"; - doInstallCheck = false; - }; libsigrokdecode = callPackage ../development/tools/libsigrokdecode { python3 = python38;