home

commit 872e40e1b643867201015861031aee9140961bda
parent eb7213bae44dd06bb3109e44138eb143de511fe4
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Wed, 22 Aug 2018 16:14:14 +0200

`op` already exists in `nixpkgs`…

… and it's call `1password`, let's use this one.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
fish/nix-aliases.fish
 | 
4
++++
M
hokkaido.nix
 | 
1
-
M
overlays/sbr.nix
 | 
3
---
M
pkgs/default.nix
 | 
3
---
D
pkgs/op/default.nix
 | 
36
------------------------------------

5 files changed, 4 insertions(+), 43 deletions(-)
diff --git a/fish/nix-aliases.fish b/fish/nix-aliases.fish
@@ -5,3 +5,7 @@ end
 function wakeonlan
     nix run nixpkgs.python36Packages.wakeonlan -c wakeonlan $argv
 end
+
+function op
+    nix run -f ~/.config/nixpkgs/channels.nix unstable.1password -c op $argv
+end
diff --git a/hokkaido.nix b/hokkaido.nix
@@ -12,7 +12,6 @@
     ./dev.haskell.nix
   ];
   home.packages = with pkgs; [
-    op
     vscode
   ];
 }
diff --git a/overlays/sbr.nix b/overlays/sbr.nix
@@ -12,9 +12,6 @@ self: super:
   envbox = import ../pkgs/envbox {
     inherit (super) stdenv lib buildGoPackage fetchFromGitHub;
   };
-  op = import ../pkgs/op {
-    inherit (super) stdenv lib fetchurl patchelf unzip file;
-  };
   prm = import ../pkgs/prm {
     inherit (super) stdenv lib buildGoPackage fetchgit;
   };
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -15,9 +15,6 @@ in rec {
   envbox = import ./envbox {
     inherit (pkgs) stdenv lib buildGoPackage fetchFromGitHub;
   };
-  op = import ./op {
-    inherit (pkgs) stdenv lib fetchurl patchelf unzip file;
-  };
   prm = import ./prm {
     inherit (pkgs) stdenv lib fetchgit;
   };
diff --git a/pkgs/op/default.nix b/pkgs/op/default.nix
@@ -1,36 +0,0 @@
-{ stdenv, lib, fetchurl, patchelf, unzip, file }:
-
-stdenv.mkDerivation rec {
-  name = "op-${version}";
-  version = "0.5.1";
-
-  src = if stdenv.system == "i686-linux" then
-    fetchurl {
-      url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
-      sha256 = "011s77krmp2fj3889fyiwhx3f9854yykd1i34y9pa8gy2hgxkh85";
-    }
-  else if stdenv.system == "x86_64-linux" then
-    fetchurl {
-      url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
-      sha256 = "18yp1ridj9v9x54jyz8yyjvnhcv6gz5bjqjv4sl8dqiy6bli4wzv";
-    }
-  else throw "platform ${stdenv.system} not supported!";
-
-  buildInputs = [ patchelf unzip file ];
-  buildCommand = ''
-    unpackFile $src
-    mkdir -p $out/bin
-    cp -a ./op $out/bin/op.wrapped
-    chmod +x $out/bin/op.wrapped
-    echo "#!/usr/bin/env bash" > $out/bin/op
-    echo $(< $NIX_CC/nix-support/dynamic-linker) $out/bin/op.wrapped \"\$@\" >> $out/bin/op
-    chmod +x $out/bin/op
-  '';
-
-  meta = {
-    description = "1password CLI";
-    homepage = "https://1password.com/";
-    license = lib.licenses.unfree;
-    platforms = lib.platforms.linux;
-  };
-}