diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 782a3ee6aad..e31b84b03b0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1825,6 +1825,11 @@ github = "joamaki"; name = "Jussi Maki"; }; + joelburget = { + email = "joelburget@gmail.com"; + github = "joelburget"; + name = "Joel Burget"; + }; joelmo = { email = "joel.moberg@gmail.com"; github = "joelmo"; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix new file mode 100644 index 00000000000..b0b6111b334 --- /dev/null +++ b/pkgs/applications/misc/1password/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchzip, makeWrapper }: + +stdenv.mkDerivation rec { + name = "1password-${version}"; + version = "0.4"; + src = if stdenv.system == "i686-linux" then fetchzip { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; + sha256 = "0mhlqvd3az50gnfil0xlq10855v3bg7yb05j6ndg4h2c551jrq41"; + stripRoot = false; + } else fetchzip { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; + sha256 = "15cv8xi4slid9jicdmc5xx2r9ag63wcx1mn7hcgzxbxbhyrvwhyf"; + stripRoot = false; + }; + + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' + mkdir -p $out/bin + install -D op $out/share/1password/op + + # https://github.com/NixOS/patchelf/issues/66#issuecomment-267743051 + makeWrapper $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/op \ + --argv0 op \ + --add-flags $out/share/1password/op + ''; + + meta = with stdenv.lib; { + description = "1Password command-line tool"; + homepage = "https://blog.agilebits.com/2017/09/06/announcing-the-1password-command-line-tool-public-beta/"; + maintainers = with maintainers; [ joelburget ]; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 546a9d9bd76..6a5d8e6f0df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -400,6 +400,8 @@ with pkgs; ### TOOLS + _1password = callPackage ../applications/misc/1password { }; + _9pfs = callPackage ../tools/filesystems/9pfs { }; a2ps = callPackage ../tools/text/a2ps { };