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: 6983abb36e42
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 57d65085125d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Aug 3, 2019

  1. typora: 0.9.72 -> 0.9.73

    @worldofpeace
    worldofpeace committed Aug 3, 2019
    Copy the full SHA
    375d7ad View commit details

Commits on Aug 4, 2019

  1. Merge pull request #65915 from worldofpeace/typora-update 

    typora: 0.9.72 -> 0.9.73
    @worldofpeace
    worldofpeace authored Aug 4, 2019
    Copy the full SHA
    57d6508 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/applications/editors/typora/default.nix
10 changes: 5 additions & 5 deletions pkgs/applications/editors/typora/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, electron_3, dpkg, gtk3, glib, gsettings-desktop-schemas, wrapGAppsHook }:
{ stdenv, fetchurl, makeWrapper, electron_5, dpkg, gtk3, glib, gsettings-desktop-schemas, wrapGAppsHook }:

stdenv.mkDerivation rec {
pname = "typora";
version = "0.9.72";
version = "0.9.73";

src = fetchurl {
url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
sha256 = "0q7fj77pr3ykpwgip87h12qxvpvlzs15mi9w3phqm3p9mmm9rlrs";
sha256 = "1fgcb4bx5pw8ah5j30d38gw7qi1cmqarfhvgdns9f2n0d57bvvw3";
};

nativeBuildInputs = [
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
'';

postFixup = ''
makeWrapper ${electron_3}/bin/electron $out/bin/typora \
makeWrapper ${electron_5}/bin/electron $out/bin/typora \
--add-flags $out/share/typora \
"''${gappsWrapperArgs[@]}" \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}"
@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
homepage = https://typora.io;
license = licenses.unfree;
maintainers = with maintainers; [ jensbin worldofpeace ];
inherit (electron_3.meta) platforms;
platforms = [ "x86_64-linux"];
};
}