diff options
author | David Asabina <vid@bina.me> | 2018-01-13 13:38:16 +0100 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2018-01-14 20:00:10 +0100 |
commit | b986078593af4108371c210ce0106b6b3e82ee20 (patch) | |
tree | e2cb5db973cb8d546f505ce251b3698fd61fbeff | |
parent | 3538492f3308952b74570ddd63e1bc1999f9c641 (diff) | |
download | nixlib-b986078593af4108371c210ce0106b6b3e82ee20.tar nixlib-b986078593af4108371c210ce0106b6b3e82ee20.tar.gz nixlib-b986078593af4108371c210ce0106b6b3e82ee20.tar.bz2 nixlib-b986078593af4108371c210ce0106b6b3e82ee20.tar.lz nixlib-b986078593af4108371c210ce0106b6b3e82ee20.tar.xz nixlib-b986078593af4108371c210ce0106b6b3e82ee20.tar.zst nixlib-b986078593af4108371c210ce0106b6b3e82ee20.zip |
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`.
-rw-r--r-- | pkgs/applications/science/electronics/bitscope/common.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/science/electronics/bitscope/packages.nix | 2 | ||||
-rw-r--r-- | 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 b93b68458f9a..90bf4dc840df 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 bb7710bf82eb..c10e9de851a4 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 5b5ad168f96a..6cdbeb7be694 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; |