From fc42c85baf894b8e86d7f5828b04eadac3a4f8f4 Mon Sep 17 00:00:00 2001 From: Vasyl Solovei Date: Wed, 21 Feb 2018 21:48:38 +0200 Subject: [PATCH] keepass-keepassrpc: init at 1.7.3.1 Repackaged as the name was confusing and there is a dedicated repository for this plugin, ready to use and with the fresh plugin version. Left an alias to an old package name. --- .../misc/keepass-plugins/keefox/default.nix | 34 ------------------ .../keepass-plugins/keepassrpc/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +-- 3 files changed, 38 insertions(+), 36 deletions(-) delete mode 100644 pkgs/applications/misc/keepass-plugins/keefox/default.nix create mode 100644 pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix diff --git a/pkgs/applications/misc/keepass-plugins/keefox/default.nix b/pkgs/applications/misc/keepass-plugins/keefox/default.nix deleted file mode 100644 index 0215c5a71c2f..000000000000 --- a/pkgs/applications/misc/keepass-plugins/keefox/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, buildEnv, fetchurl, mono, unzip }: - -let - version = "1.6.4"; - drv = stdenv.mkDerivation { - name = "keefox-${version}"; - src = fetchurl { - url = "https://github.com/luckyrat/KeeFox/releases/download/v${version}/${version}.xpi"; - sha256 = "0nj4l9ssyfwbl1pxgxvd2h9q0mqhx7i0yzm4a2xjqlqwam534d1w"; - }; - - meta = { - description = "Keepass plugin for keefox Firefox add-on"; - homepage = http://keefox.org; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.mjanczyk ]; - }; - - buildInputs = [ unzip ]; - - pluginFilename = "KeePassRPC.plgx"; - - unpackCmd = "unzip $src deps/$pluginFilename "; - sourceRoot = "deps"; - - installPhase = '' - mkdir -p $out/lib/dotnet/keepass/ - cp $pluginFilename $out/lib/dotnet/keepass/$pluginFilename - ''; - }; -in - # Mono is required to compile plugin at runtime, after loading. - buildEnv { name = drv.name; paths = [ mono drv ]; } diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix new file mode 100644 index 000000000000..b2980bcd8aea --- /dev/null +++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildEnv, fetchurl, mono }: + +let + version = "1.7.3.1"; + drv = stdenv.mkDerivation { + name = "keepassrpc-${version}"; + src = fetchurl { + url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx"; + sha256 = "1y9b35qg27caj3pbaqqzrqpk61hbbd8617ziwdc9vl799i786m9k"; + }; + + meta = with stdenv.lib; { + description = "The KeePassRPC plugin that needs to be installed inside KeePass in order for Kee to be able to connect your browser to your passwords"; + homepage = https://github.com/kee-org/keepassrpc; + platforms = [ "x86_64-linux" ]; + license = licenses.gpl2; + maintainers = with maintainers; [ mjanczyk svsdep ]; + }; + + pluginFilename = "KeePassRPC.plgx"; + + unpackCmd = '' + mkdir deps/ + cp -p $src deps/$pluginFilename + ''; + sourceRoot = "deps"; + + installPhase = '' + mkdir -p $out/lib/dotnet/keepass/ + cp $pluginFilename $out/lib/dotnet/keepass/$pluginFilename + ''; + }; +in + # Mono is required to compile plugin at runtime, after loading. + buildEnv { name = drv.name; paths = [ mono drv ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b643ab1f6eb6..c59bb361ce44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15237,10 +15237,11 @@ with pkgs; keepass-keeagent = callPackage ../applications/misc/keepass-plugins/keeagent { }; - keepass-keefox = callPackage ../applications/misc/keepass-plugins/keefox { }; - keepass-keepasshttp = callPackage ../applications/misc/keepass-plugins/keepasshttp { }; + keepass-keepassrpc = callPackage ../applications/misc/keepass-plugins/keepassrpc { }; + keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 + exrdisplay = callPackage ../applications/graphics/exrdisplay { }; exrtools = callPackage ../applications/graphics/exrtools { };