From e4e631ebb81da8b76f9159736b63c727c05aa4db Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 12 Jul 2021 12:51:53 +0200 Subject: applications/networking: /s/name/pname&version/ --- .../networking/apache-directory-studio/default.nix | 26 ++++++++++------------ 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'pkgs/applications/networking/apache-directory-studio') diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index 18f9a7990c3..970949d691e 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -1,21 +1,9 @@ { lib, stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret }: -let - desktopItem = makeDesktopItem { - name = "apache-directory-studio"; - exec = "ApacheDirectoryStudio"; - icon = "apache-directory-studio"; - comment = "Eclipse-based LDAP browser and directory client"; - desktopName = "Apache Directory Studio"; - genericName = "Apache Directory Studio"; - categories = "Java;Network"; - }; - version = "2.0.0-M15"; - versionWithDate = "2.0.0.v20200411-M15"; -in stdenv.mkDerivation rec { pname = "apache-directory-studio"; - inherit version; + version = "2.0.0-M15"; + versionWithDate = "2.0.0.v20200411-M15"; src = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -25,6 +13,16 @@ stdenv.mkDerivation rec { } else throw "Unsupported system: ${stdenv.hostPlatform.system}"; + desktopItem = makeDesktopItem { + name = "apache-directory-studio"; + exec = "ApacheDirectoryStudio"; + icon = "apache-directory-studio"; + comment = "Eclipse-based LDAP browser and directory client"; + desktopName = "Apache Directory Studio"; + genericName = "Apache Directory Studio"; + categories = "Java;Network"; + }; + buildInputs = [ glib libsecret ]; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; -- cgit 1.4.1 From 672a6a6db10c0064ab3fd003af55a6b5b846dc55 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 25 Jul 2021 00:04:08 +0200 Subject: apache-directory-studio: 2.0.0-M15 -> 2.0.0-M17 (fix incorrect merge) --- pkgs/applications/networking/apache-directory-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/networking/apache-directory-studio') diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index 242ca8e6bfe..d9fe26fdbdc 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -2,8 +2,8 @@ stdenv.mkDerivation rec { pname = "apache-directory-studio"; - version = "2.0.0-M15"; - versionWithDate = "2.0.0.v20200411-M15"; + version = "2.0.0-M17"; + versionWithDate = "2.0.0.v20210717-M17"; src = if stdenv.hostPlatform.system == "x86_64-linux" then -- cgit 1.4.1