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

Commits on Nov 28, 2019

  1. simplenote: 1.9.1 -> 1.11.0

    @Kiwi
    Kiwi committed Nov 28, 2019
    Copy the full SHA
    bf78367 View commit details

  2. Merge pull request #74467 from Kiwi/simplenote-update 

    simplenote: 1.9.1 -> 1.11.0
    @worldofpeace
    worldofpeace authored Nov 28, 2019
    Copy the full SHA
    a1ea2cf View commit details
Showing with 37 additions and 17 deletions.
  1. +37 −17 pkgs/applications/misc/simplenote/default.nix
54 changes: 37 additions & 17 deletions pkgs/applications/misc/simplenote/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,37 @@
{ atomEnv, autoPatchelfHook, dpkg, fetchurl, makeDesktopItem, makeWrapper
, stdenv, udev, wrapGAppsHook }:
{ atomEnv
, autoPatchelfHook
, dpkg
, fetchurl
, makeDesktopItem
, makeWrapper
, stdenv
, udev
, wrapGAppsHook
}:

let
inherit (stdenv.hostPlatform) system;

throwSystem = throw "Unsupported system: ${system}";

pname = "simplenote";

version = "1.9.1";
version = "1.11.0";

sha256 = {
x86_64-linux = "1zqrjh1xfdpkpj1fsri9r4qkazh9j89pbj8vjr474b39v56v693j";
}.${system};
x86_64-linux = "1ljam1yfiy1lh6lrknrq7cdqpj1q7f655mxjiiwv3izp98qr1f8s";
}.${system} or throwSystem;

meta = with stdenv.lib; {
description = "The simplest way to keep notes";
homepage = "https://github.com/Automattic/simplenote-electron";
license = licenses.gpl2;
maintainers = with maintainers; [ kiwi ];
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [
kiwi
];
platforms = [
"x86_64-linux"
];
};

linux = stdenv.mkDerivation rec {
@@ -31,24 +45,29 @@ let
};

desktopItem = makeDesktopItem {
name = "simplenote";
categories = "Development";
comment = "Simplenote for Linux";
desktopName = "Simplenote";
exec = "simplenote %U";
icon = "simplenote";
type = "Application";
name = "simplenote";
startupNotify = "true";
desktopName = "Simplenote";
categories = "Development";
type = "Application";
};

dontBuild = true;
dontConfigure = true;
dontPatchELF = true;
dontWrapGApps = true;

buildInputs = atomEnv.packages;
nativeBuildInputs = [
autoPatchelfHook
dpkg
makeWrapper
wrapGAppsHook
];

nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ];
buildInputs = atomEnv.packages;

unpackPhase = "dpkg-deb -x $src .";

@@ -62,14 +81,15 @@ let
cp "${desktopItem}/share/applications/"* "$out/share/applications"
'';

runtimeDependencies = [ udev.lib ];
runtimeDependencies = [
udev.lib
];

postFixup = ''
ls -ahl $out
makeWrapper $out/opt/Simplenote/simplenote $out/bin/simplenote \
"''${gappsWrapperArgs[@]}"
"''${gappsWrapperArgs[@]}"
'';
};

in
linux
linux