diff options
author | K900 <me@0upti.me> | 2022-02-22 17:56:15 +0300 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2022-02-25 13:40:38 -0800 |
commit | cb2cfba6f7690d4b8754b0dd5a504efe93d7f44d (patch) | |
tree | 63bf69cdc1c296e10bf6543aa890855cccf1da57 /pkgs/development/tools | |
parent | 0c713dbed40dd87090a4632cffc7b088653f35cb (diff) |
treewide: switch all desktop file generators to new API
Notably: - remove explicit arguments that match the defaults - convert everything to the right Nix types
Diffstat (limited to 'pkgs/development/tools')
13 files changed, 16 insertions, 18 deletions
diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 92f7e80951285..4ec5b28bdd032 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -17,7 +17,7 @@ let generic = { version, sha256 }: desktopName = "Alloy ${lib.versions.major version}"; genericName = "Relational modelling tool"; comment = meta.description; - categories = "Development;IDE;Education;"; + categories = [ "Development" "IDE" "Education" ]; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index ef95263185c9e..da43a4daf7d12 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -10,7 +10,7 @@ let desktopName = "Oracle SQL Developer"; genericName = "Oracle SQL Developer"; comment = "Oracle's Oracle DB GUI client"; - categories = "Development;"; + categories = [ "Development" ]; }; in stdenv.mkDerivation { diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 0220e2d61f9df..e908849a3b3ac 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "SQuirreL SQL"; genericName = "SQL Client"; - categories = "Development;"; + categories = [ "Development" ]; icon = "squirrel-sql"; }; diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index 01146542d0cce..7408b35fe5ad2 100644 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { comment = "Eclipse Memory Analyzer"; desktopName = "Eclipse MAT"; genericName = "Java Memory Analyzer"; - categories = "Development;"; + categories = [ "Development" ]; }; unpackPhase = '' diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 7f89961f9f80d..ee72bc62efae0 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { comment = "Java Troubleshooting Tool"; desktopName = "VisualVM"; genericName = "Java Troubleshooting Tool"; - categories = "Development;"; + categories = [ "Development" ]; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/jpexs/default.nix b/pkgs/development/tools/jpexs/default.nix index 37d1cf7dc2e47..8c0d20d328d22 100644 --- a/pkgs/development/tools/jpexs/default.nix +++ b/pkgs/development/tools/jpexs/default.nix @@ -36,10 +36,8 @@ stdenv.mkDerivation rec { desktopName = "JPEXS Free Flash Decompiler"; genericName = "Flash Decompiler"; comment = meta.description; - categories = "Development;Java;"; - extraEntries = '' - StartupWMClass=com-jpexs-decompiler-flash-gui-Main - ''; + categories = [ "Development" "Java" ]; + startupWMClass = "com-jpexs-decompiler-flash-gui-Main"; }; meta = with lib; { diff --git a/pkgs/development/tools/mars-mips/default.nix b/pkgs/development/tools/mars-mips/default.nix index 97ffd564c45cd..fa98ab9da8f16 100644 --- a/pkgs/development/tools/mars-mips/default.nix +++ b/pkgs/development/tools/mars-mips/default.nix @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec { exec = "mars-mips"; icon = "mars-mips"; comment = "An IDE for programming in MIPS assembly language"; - categories = "Development;IDE;"; + categories = [ "Development" "IDE" ]; }) ]; diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index 4472cae2053a5..242d76174ce9d 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -13,7 +13,7 @@ let comment = "Software for Saleae logic analyzers"; desktopName = "Saleae Logic"; genericName = "Logic analyzer"; - categories = "Development"; + categories = [ "Development" ]; }; in appimageTools.wrapType2 { diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 5943b57d80889..487445e0fc35b 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { comment = "Software for Saleae logic analyzers"; desktopName = "Saleae Logic"; genericName = "Logic analyzer"; - categories = "Development"; + categories = [ "Development" ]; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index ea842c8208995..ee03e043dd86b 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { exec = "react-native-debugger"; desktopName = "React Native Debugger"; genericName = "React Native Debugger"; - categories = "Development;Debugger;"; + categories = [ "Development" "Debugger" ]; }; meta = with lib; { diff --git a/pkgs/development/tools/scenebuilder/default.nix b/pkgs/development/tools/scenebuilder/default.nix index 438555998fde4..3ae31bbadb9b6 100644 --- a/pkgs/development/tools/scenebuilder/default.nix +++ b/pkgs/development/tools/scenebuilder/default.nix @@ -69,8 +69,8 @@ let icon = "scenebuilder"; comment = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; desktopName = pname; - mimeType = "application/java;application/java-vm;application/java-archive"; - categories = "Development"; + mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; + categories = [ "Development" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/scenic-view/default.nix b/pkgs/development/tools/scenic-view/default.nix index 6dd3e11b60956..1322cfc751a82 100644 --- a/pkgs/development/tools/scenic-view/default.nix +++ b/pkgs/development/tools/scenic-view/default.nix @@ -66,8 +66,8 @@ let desktopName = pname; exec = pname; comment = "JavaFx application to visualize and modify the scenegraph of running JavaFx applications."; - mimeType = "application/java;application/java-vm;application/java-archive"; - categories = "Development"; + mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; + categories = [ "Development" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix index 58fef12cd6e8c..8f8d03db950b1 100644 --- a/pkgs/development/tools/winpdb/default.nix +++ b/pkgs/development/tools/winpdb/default.nix @@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec { comment = "Platform independend Python debugger"; desktopName = "Winpdb"; genericName = "Python Debugger"; - categories = "Development;Debugger;"; + categories = [ "Development" "Debugger" ]; }; # Don't call gnome-terminal with "--disable-factory" flag, which is |