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: cbaa9a7ab917
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: 4fcf0bbb2086
Choose a head ref
  • 7 commits
  • 4 files changed
  • 4 contributors

Commits on Jun 4, 2019

  1. trilium: 0.30.8 -> 0.32.3

    @dtzWill
    dtzWill committed Jun 4, 2019
    Copy the full SHA
    a4113fe View commit details

Commits on Jun 6, 2019

  1. pythonPackages.asttokens: fix python3 build

    @marsam
    marsam committed Jun 6, 2019
    Copy the full SHA
    c091347 View commit details

Commits on Jun 7, 2019

  1. Merge pull request #62788 from marsam/fix-build-python3-asttokens 

    pythonPackages.asttokens: fix python3 build
    @worldofpeace
    worldofpeace authored Jun 7, 2019
    Copy the full SHA
    7fe8e51 View commit details

  2. trilium: 0.32.3 -> 0.32.4

    @dtzWill
    dtzWill committed Jun 7, 2019
    Copy the full SHA
    1a9a7fb View commit details

  3. Merge pull request #62692 from dtzWill/update/trilium-0.32.3 

    trilium: 0.30.8 -> 0.32.4
    @dtzWill
    dtzWill authored Jun 7, 2019
    Copy the full SHA
    a86ad90 View commit details

  4. vimPlugins.vim-csharp: init at 2017-03-29

    Jonathan Ringer authored and Matthieu Coudron committed Jun 7, 2019
    Copy the full SHA
    e091771 View commit details

  5. vimPlugins.SpaceCamp: init at 2019-06-05

    Jonathan Ringer authored and Matthieu Coudron committed Jun 7, 2019
    Copy the full SHA
    4fcf0bb View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/office/trilium/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,11 +13,11 @@ let

in stdenv.mkDerivation rec {
name = "trilium-${version}";
version = "0.30.8";
version = "0.32.4";

src = fetchurl {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
sha256 = "1mw8m9qm5jqfbwzj721gyfa656bp3hs8mrqx5d354rbx5f12pgjr";
sha256 = "05h5k5n63pmf6mmyfpw41xf6lzfd8dwdhy7r5fmhdxy2gpl3a817";
};

# Fetch from source repo, no longer included in release.
10 changes: 9 additions & 1 deletion pkgs/development/python-modules/asttokens/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, fetchPypi, buildPythonPackage, astroid, six, coverage
{ lib, fetchPypi, buildPythonPackage, fetchpatch, astroid, six, coverage
, lazy-object-proxy, nose, wrapt
}:

@@ -11,6 +11,14 @@ buildPythonPackage rec {
sha256 = "1vd4djlxmgznz84gzakkv45avnrcpgl1kir92l1pxyp0z5c0dh2m";
};

patches = [
# Fix tests for astroid 2.2 in python 3. Remove with the next release
(fetchpatch {
url = "https://github.com/gristlabs/asttokens/commit/21caaaa74105c410b3d84c3d8ff0dc2f612aac9a.patch";
sha256 = "182xfr0cx4pxx0dv1l50a1c281h8ywir8vvd1zh5iicflivim1nv";
})
];

propagatedBuildInputs = [ lazy-object-proxy six wrapt astroid ];

checkInputs = [ coverage nose ];
22 changes: 22 additions & 0 deletions pkgs/misc/vim-plugins/generated.nix
View file
Original file line number Diff line number Diff line change
@@ -1651,6 +1651,17 @@ let
};
};

SpaceCamp = buildVimPluginFrom2Nix {
pname = "SpaceCamp";
version = "2019-06-05";
src = fetchFromGitHub {
owner = "jaredgorski";
repo = "SpaceCamp";
rev = "de431dc161f8f839a47c6f1cb277e7318ddba6f5";
sha256 = "032i1isc558rz2hmh3dfxnwgbqn7wdlhzz1c05v6bd7yyv0k5g23";
};
};

Spacegray-vim = buildVimPluginFrom2Nix {
pname = "Spacegray-vim";
version = "2019-02-23";
@@ -2410,6 +2421,17 @@ let
};
};

vim-csharp = buildVimPluginFrom2Nix {
pname = "vim-csharp";
version = "2017-03-29";
src = fetchFromGitHub {
owner = "OrangeT";
repo = "vim-csharp";
rev = "b5982fc69bba7d507638a308d6875b031054280d";
sha256 = "16sf3yqvd36b4rkrh6w7jskvlkrgymwa13xcvh586lmlc7g6ilcx";
};
};

vim-css-color = buildVimPluginFrom2Nix {
pname = "vim-css-color";
version = "2019-05-14";
2 changes: 2 additions & 0 deletions pkgs/misc/vim-plugins/vim-plugin-names
View file
Original file line number Diff line number Diff line change
@@ -105,6 +105,7 @@ itchyny/vim-gitbranch
ivanov/vim-ipython
jacoborus/tender.vim
janko-m/vim-test
jaredgorski/SpaceCamp
JazzCore/ctrlp-cmatcher
jceb/vim-hier
jceb/vim-orgmode
@@ -226,6 +227,7 @@ NLKNguyen/papercolor-theme
noc7c9/vim-iced-coffee-script
ntpeters/vim-better-whitespace
nvie/vim-flake8
OrangeT/vim-csharp
osyo-manga/shabadou.vim
osyo-manga/vim-anzu
osyo-manga/vim-textobj-multiblock