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`.

authored by David Asabina and committed by Bjørn Forsman b9860785 3538492f

+9 -5
+6 -3
pkgs/applications/science/electronics/bitscope/common.nix
··· 9 , makeWrapper 10 , pango 11 , stdenv 12 - , writeScriptBin 13 , xorg 14 }: 15 ··· 60 ${(wrapBinary libs) attrs.toolName} 61 ''; 62 }); 63 in buildFHSUserEnv { 64 name = attrs.toolName; 65 - meta = pkg.meta; 66 runScript = "${pkg.outPath}/bin/${attrs.toolName}"; 67 - }
··· 9 , makeWrapper 10 , pango 11 , stdenv 12 + , writeTextFile 13 , xorg 14 }: 15 ··· 60 ${(wrapBinary libs) attrs.toolName} 61 ''; 62 }); 63 + fhs = target: buildFHSUserEnv { 64 + inherit (pkg) name; 65 + runScript = target; 66 + }; 67 in buildFHSUserEnv { 68 name = attrs.toolName; 69 runScript = "${pkg.outPath}/bin/${attrs.toolName}"; 70 + } // { inherit (pkg) meta name; }
+1 -1
pkgs/applications/science/electronics/bitscope/packages.nix
··· 88 89 meta = { 90 description = "Mixed signal logic timing and serial protocol analysis software for BitScope"; 91 - home = "http://bitscope.com/software/logic/"; 92 }; 93 94 src = fetchurl {
··· 88 89 meta = { 90 description = "Mixed signal logic timing and serial protocol analysis software for BitScope"; 91 + homepage = "http://bitscope.com/software/logic/"; 92 }; 93 94 src = fetchurl {
+2 -1
pkgs/top-level/all-packages.nix
··· 14262 14263 bitmeter = callPackage ../applications/audio/bitmeter { }; 14264 14265 - bitscope = callPackage ../applications/science/electronics/bitscope/packages.nix { }; 14266 14267 bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix { 14268 inherit (gnome2) zenity;
··· 14262 14263 bitmeter = callPackage ../applications/audio/bitmeter { }; 14264 14265 + bitscope = recurseIntoAttrs 14266 + (callPackage ../applications/science/electronics/bitscope/packages.nix { }); 14267 14268 bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix { 14269 inherit (gnome2) zenity;