From b986078593af4108371c210ce0106b6b3e82ee20 Mon Sep 17 00:00:00 2001 From: David Asabina Date: Sat, 13 Jan 2018 13:38:16 +0100 Subject: [PATCH] bitscope: refactored to pass nixpkgs-lint The linter (nixpkgs-lint) was not able to find the bitscope packages because `recurseIntoAttrs` was not applied to the suite's set. The name supplied to `buildFHSUserEnv` produces a binary that corresponds to the binary names in the deb packages (e.g.: bitscope-dso, bitscope-chart, bitscope-logic, etc), however; this name does not constitute a valid nixpkgs name. Valid nixpkgs names satisfy the `/(.*)(-[0-9].*)$/` pattern, therefore a valid name is merged into the derivation produced by `buildFHSUserEnv`. --- .../applications/science/electronics/bitscope/common.nix | 9 ++++++--- .../science/electronics/bitscope/packages.nix | 2 +- pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index b93b68458f9..90bf4dc840d 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -9,7 +9,7 @@ , makeWrapper , pango , stdenv -, writeScriptBin +, writeTextFile , xorg }: @@ -60,8 +60,11 @@ let ${(wrapBinary libs) attrs.toolName} ''; }); + fhs = target: buildFHSUserEnv { + inherit (pkg) name; + runScript = target; + }; in buildFHSUserEnv { name = attrs.toolName; - meta = pkg.meta; runScript = "${pkg.outPath}/bin/${attrs.toolName}"; -} +} // { inherit (pkg) meta name; } diff --git a/pkgs/applications/science/electronics/bitscope/packages.nix b/pkgs/applications/science/electronics/bitscope/packages.nix index bb7710bf82e..c10e9de851a 100644 --- a/pkgs/applications/science/electronics/bitscope/packages.nix +++ b/pkgs/applications/science/electronics/bitscope/packages.nix @@ -88,7 +88,7 @@ in { meta = { description = "Mixed signal logic timing and serial protocol analysis software for BitScope"; - home = "http://bitscope.com/software/logic/"; + homepage = "http://bitscope.com/software/logic/"; }; src = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b5ad168f96..6cdbeb7be69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14262,7 +14262,8 @@ with pkgs; bitmeter = callPackage ../applications/audio/bitmeter { }; - bitscope = callPackage ../applications/science/electronics/bitscope/packages.nix { }; + bitscope = recurseIntoAttrs + (callPackage ../applications/science/electronics/bitscope/packages.nix { }); bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix { inherit (gnome2) zenity;