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`.
NixOS · Jan 14, 2018 · b986078 · b986078
1 parent 3538492
commit b986078
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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;