Skip to content

Commit 6828aea

Browse files
committed
savvycan: migrate to by-name
1 parent 517ecd6 commit 6828aea

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

pkgs/applications/networking/sniffers/savvycan/default.nix renamed to pkgs/by-name/sa/savvycan/package.nix

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,10 @@
22
stdenv,
33
lib,
44
fetchFromGitHub,
5-
qtbase,
6-
qttools,
7-
qmake,
8-
qtserialbus,
9-
qtserialport,
10-
qtdeclarative,
11-
wrapQtAppsHook,
5+
qt5,
126
}:
137

148
stdenv.mkDerivation rec {
15-
169
pname = "savvycan";
1710
version = "220";
1811

@@ -24,16 +17,16 @@ stdenv.mkDerivation rec {
2417
};
2518

2619
buildInputs = [
27-
qtbase
28-
qttools
29-
qtserialbus
30-
qtserialport
31-
qtdeclarative
20+
qt5.qtbase
21+
qt5.qttools
22+
qt5.qtserialbus
23+
qt5.qtserialport
24+
qt5.qtdeclarative
3225
];
3326

3427
nativeBuildInputs = [
35-
qmake
36-
wrapQtAppsHook
28+
qt5.qmake
29+
qt5.wrapQtAppsHook
3730
];
3831

3932
meta = with lib; {
@@ -70,5 +63,4 @@ stdenv.mkDerivation rec {
7063
it!
7164
'';
7265
};
73-
7466
}

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13987,8 +13987,6 @@ with pkgs;
1398713987

1398813988
rusty-psn-gui = rusty-psn.override { withGui = true; };
1398913989

13990-
savvycan = libsForQt5.callPackage ../applications/networking/sniffers/savvycan { };
13991-
1399213990
sayonara = libsForQt5.callPackage ../applications/audio/sayonara { };
1399313991

1399413992
scantailor-advanced = libsForQt5.callPackage ../applications/graphics/scantailor/advanced.nix { };

0 commit comments

Comments
 (0)