Unverified Commit 2a4f2b08 authored by maxine [they]'s avatar maxine [they] Committed by GitHub
Browse files

Merge pull request #186346 from maxeaubrey/1password 

_1password-gui: 8.7.3 -> 8.8.0
parents b4110fd2 170bb5f0

pkgs/applications/misc/1password-gui/beta.nix

+3 −3
Original line number Diff line number Diff line
@@ -44,18 +44,18 @@ let 


in stdenv.mkDerivation rec {

  pname = "1password";

  version = "8.8.0-215.BETA";

  version = "8.9.0-1.BETA";



  src =

    if stdenv.hostPlatform.isAarch64 then

      fetchurl {

        url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";

        sha256 = "sha256-GjLwLeJ6GE39NFIZ+v83xaUVsgrkKRH3xt60aG/XrDg=";

        sha256 = "0wxf1l6wh5m80f6s4f32j9i7f233lg162fw40770xxgwv8bl1f6a";

      }

    else

      fetchurl {

        url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";

        sha256 = "sha256-TR0evvu5NNR6Kvqj8JlpYuTcK9Rmf1oDFGrfzrGZzo8=";

        sha256 = "0vqrcwn5y350g91w3kh8n43gw21kck1cwim92dw9i0xxxch91hrg";

      };



  nativeBuildInputs = [ makeWrapper ];

pkgs/applications/misc/1password-gui/default.nix

+14 −9
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
, libxcb

, libxkbcommon

, libxshmfence

, libappindicator-gtk3

, libGL

, libappindicator-gtk3

, mesa

, nspr

, nss
@@ -44,11 +44,18 @@ let 


in stdenv.mkDerivation rec {

  pname = "1password";

  version = "8.7.3";

  version = "8.8.0";



  src = fetchurl {

  src =

    if stdenv.hostPlatform.isAarch64 then

      fetchurl {

        url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";

        sha256 = "01swx12nqqh9i3191ibc8gv92k4dzsk1qpikg053qhn1zh2ag1dd";

      }

    else

      fetchurl {

        url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";

    sha256 = "sha256-1JMSUKbeqcyz5SJLrPD9kaqSlPI0pZVMXFjRuMIvwqo=";

        sha256 = "1rcvxxcz2q7kgf6qbcjnjhysnx9z81hvl0jfv0nkp0p1w8bf1h66";

      };



  nativeBuildInputs = [ makeWrapper ];
@@ -126,14 +133,12 @@ in stdenv.mkDerivation rec { 
      runHook postInstall

    '';



  passthru.updateScript = ./update.sh;



  meta = with lib; {

    description = "Multi-platform password manager";

    homepage = "https://1password.com/";

    sourceProvenance = with sourceTypes; [ binaryNativeCode ];

    license = licenses.unfree;

    maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ];

    platforms = [ "x86_64-linux" ];

    platforms = [ "x86_64-linux" "aarch64-linux" ];

  };

}

pkgs/applications/misc/1password-gui/update.sh

deleted100755 → 0
+0 −5
Original line number Diff line number Diff line 
#!/usr/bin/env nix-shell

#!nix-shell -i bash -p curl gnused common-updater-scripts



version="$(curl -sL https://onepassword.s3.amazonaws.com/linux/debian/dists/edge/main/binary-amd64/Packages | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)"

update-source-version _1password-gui "$version"