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

Commits on Aug 19, 2019

  1. vnote: fix by using qt's mkDerivation, 2.6 -> 2.7.2 

    https://github.com/tamlok/vnote/releases/tag/v2.7.2
https://github.com/tamlok/vnote/releases/tag/v2.7.1
https://github.com/tamlok/vnote/releases/tag/v2.7
    @dtzWill
    dtzWill committed Aug 19, 2019
    Copy the full SHA
    4a69c97 View commit details

Commits on Aug 20, 2019

  1. Merge pull request #66986 from dtzWill/fix/vnote-qt-mkderiv 

    vnote: fix by using qt's mkDerivation, 2.6 -> 2.7.2
    @worldofpeace
    worldofpeace authored Aug 20, 2019
    Copy the full SHA
    912b09e View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/applications/office/vnote/default.nix
10 changes: 5 additions & 5 deletions pkgs/applications/office/vnote/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{ stdenv, fetchFromGitHub, qmake, qtbase, qtwebengine, hicolor-icon-theme, makeDesktopItem }:
{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtwebengine, hicolor-icon-theme }:

let
description = "A note-taking application that knows programmers and Markdown better";
in stdenv.mkDerivation rec {
version = "2.6";
in mkDerivation rec {
version = "2.7.2";
pname = "vnote";

src = fetchFromGitHub {
owner = "tamlok";
repo = "vnote";
fetchSubmodules = true;
rev = "v${version}";
sha256 = "10lnzzwz7fjj55kbn3j6gdl9yi6a85mdjis586p3zcc4830mlv91";
sha256 = "0mk1ingcyznpwq4bfkxa8nx9yx5y3kgsmr4qffriq7bh1cx9dwjy";
};

nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtwebengine hicolor-icon-theme ];

meta = with stdenv.lib; {
meta = with lib; {
inherit description;
homepage = "https://tamlok.github.io/vnote";
license = licenses.mit;