Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e0e2e4f2bc2b
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dce17f49972e
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Jul 7, 2020

  1. nixos/plasma5: Noto Mono -> Noto Sans Mono 

    The font has been renamed.
See notofonts/noto-fonts#1029

(cherry picked from commit 82cf1d9)
    @samuelgrf
    samuelgrf committed Jul 7, 2020
    Copy the full SHA
    a47a25d View commit details

  2. typora: 0.9.73 -> 0.9.89 

    (cherry picked from commit c886cb0)
    @oxalica
    oxalica committed Jul 7, 2020
    Copy the full SHA
    39f0831 View commit details

  3. Merge pull request #92610 from samuelgrf/fix-backport/plasma5-noto-re… 

    …name

[20.03] nixos/plasma5: Noto Mono -> Noto Sans Mono
    @worldofpeace
    worldofpeace authored Jul 7, 2020
    Copy the full SHA
    7ce93dd View commit details

  4. Merge pull request #92614 from oxalica/backport-20.03/typora 

    [20.03] typora: 0.9.73 -> 0.9.89
    @worldofpeace
    worldofpeace authored Jul 7, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dce17f4 View commit details
Showing with 7 additions and 6 deletions.
  1. +1 −1 nixos/modules/services/x11/desktop-managers/plasma5.nix
  2. +6 −5 pkgs/applications/editors/typora/default.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/desktop-managers/plasma5.nix
View file
Original file line number Diff line number Diff line change
@@ -302,7 +302,7 @@ in

fonts.fonts = with pkgs; [ noto-fonts hack-font ];
fonts.fontconfig.defaultFonts = {
monospace = [ "Hack" "Noto Mono" ];
monospace = [ "Hack" "Noto Sans Mono" ];
sansSerif = [ "Noto Sans" ];
serif = [ "Noto Serif" ];
};
11 changes: 6 additions & 5 deletions pkgs/applications/editors/typora/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
, lib
, fetchurl
, makeWrapper
, electron_5
, electron_8
, dpkg
, gtk3
, glib
@@ -14,11 +14,11 @@

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

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

nativeBuildInputs = [
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
gtk3
];

unpackPhase = "dpkg-deb -x $src .";
# The deb contains setuid permission on `chrome-sandbox`, which will actually not get installed.
unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";

dontWrapGApps = true;

@@ -51,7 +52,7 @@ stdenv.mkDerivation rec {
'';

postFixup = ''
makeWrapper ${electron_5}/bin/electron $out/bin/typora \
makeWrapper ${electron_8}/bin/electron $out/bin/typora \
--add-flags $out/share/typora \
"''${gappsWrapperArgs[@]}" \
${lib.optionalString withPandoc ''--prefix PATH : "${lib.makeBinPath [ pandoc ]}"''} \