Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f1405f3eae16
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3465f3a4982b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 5, 2019

  1. protonmail-bridge: 1.1.1-1 -> 1.1.3-1 

    Includes MIME bugfixes
    @aaronjanse
    aaronjanse authored Mar 5, 2019
    Copy the full SHA
    a8fccc2 View commit details

Commits on Mar 8, 2019

  1. Merge pull request #56926 from aaronduino/patch-2 

    protonmail-bridge: 1.1.1-1 -> 1.1.3-1
    @Mic92
    Mic92 authored Mar 8, 2019
    Copy the full SHA
    3465f3a View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/applications/networking/protonmail-bridge/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/networking/protonmail-bridge/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }:

let
version = "1.1.1-1";
version = "1.1.3-1";

description = ''
An application that runs on your computer in the background and seamlessly encrypts
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {

src = fetchurl {
url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb";
sha256 = "148syyz92yqxp2fw18fhflhmdrakxz7cc30va7h0pwysz97gni2p";
sha256 = "15kyhyx1v4bb2sqzwq7bqrxxw7g733p5jnsgjqka2ygzg6dl2c5n";
};

nativeBuildInputs = [ makeWrapper ];
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
mkdir -p $out/{bin,lib,share/applications}
mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
cp -r usr/lib/protonmail/bridge/protonmail-bridge{,.sh} $out/lib
cp -r usr/lib/protonmail/bridge/protonmail-bridge $out/lib
cp usr/share/icons/protonmail/ProtonMail_Bridge.svg $out/share/icons/hicolor/scalable/apps/protonmail-bridge.svg
cp ${desktopItem}/share/applications/* $out/share/applications