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: d14cea0dec2d
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: 333c287a4f5c
Choose a head ref
  • 8 commits
  • 6 files changed
  • 5 contributors

Commits on Jan 19, 2020

  1. Remove myself from maintainers on some packages

    @ivan
    ivan committed Jan 19, 2020
    Copy the full SHA
    14361f7 View commit details

Commits on Jan 20, 2020

  1. Merge pull request #78028 from ivan/unmaintain-some-19.09 

    [19.09] Remove myself from maintainers on some packages
    @worldofpeace
    worldofpeace authored Jan 20, 2020
    Copy the full SHA
    383ad09 View commit details

  2. vim: 8.1.1967 -> 8.1.2188 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vim/versions

(cherry picked from commit bacc6dc)
    @r-ryantm @NeQuissimus
    r-ryantm authored and NeQuissimus committed Jan 20, 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
    31077da View commit details

  3. vim: 8.1.2188 -> 8.1.2237 

    (cherry picked from commit 02c3bce)
    @r-ryantm @NeQuissimus
    r-ryantm authored and NeQuissimus committed Jan 20, 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
    7d3a3b0 View commit details

  4. vimHugeX: 8.1.2237 -> 8.1.2407 

    (cherry picked from commit f45df9c)
    @r-ryantm @NeQuissimus
    r-ryantm authored and NeQuissimus committed Jan 20, 2020
    Copy the full SHA
    d50c6b3 View commit details

  5. vim: 8.1.2407 -> 8.2.0013 

    (cherry picked from commit 3e50d4a)
    @equirosa @NeQuissimus
    equirosa authored and NeQuissimus committed Jan 20, 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
    7cb9153 View commit details

Commits on Jan 21, 2020

  1. matomo: 3.13.0 -> 3.13.1 

    backport of 26c3e67
    @marsam
    marsam committed Jan 21, 2020
    Copy the full SHA
    4efac13 View commit details

  2. Add myself to maintainers list. 

    This fixes eval that 7cb9153 broke.

(cherry picked from commit 4f8e9b2)
    @equirosa @andir
    equirosa authored and andir committed Jan 21, 2020
    Copy the full SHA
    333c287 View commit details
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -1983,6 +1983,12 @@
email = "mpcervin@uncg.edu";
name = "Mabry Cervin";
};
equirosa = {
email = "eduardo@eduardoquiros.com";
github = "equirosa";
githubId = 39096810;
name = "Eduardo Quiros";
};
eqyiel = {
email = "ruben@maher.fyi";
github = "eqyiel";
6 changes: 3 additions & 3 deletions pkgs/applications/editors/vim/common.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
version = "8.1.1967";
version = "8.2.0013";

src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
sha256 = "0cdfi67jwv8j982i1jxdfqv4aqglig8f0hzadgygk69i0wwkymwk";
sha256 = "00sc9zdjdww6f3svwf0nxpx8q2zp1n1r978h7ijapgvn2ysx2z1f";
};

enableParallelBuilding = true;
@@ -24,7 +24,7 @@ rec {
description = "The most popular clone of the VI editor";
homepage = http://www.vim.org;
license = licenses.vim;
maintainers = with maintainers; [ lovek323 ];
maintainers = with maintainers; [ lovek323 equirosa ];
platforms = platforms.unix;
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/misc/qolibri/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ mkDerivation {
homepage = https://github.com/ludios/qolibri;
description = "EPWING reader for viewing Japanese dictionaries";
platforms = platforms.linux;
maintainers = with maintainers; [ ivan ];
maintainers = with maintainers; [ ];
license = licenses.gpl2;
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/networking/browsers/chromium/browser.nix
View file
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ mkChromiumDerivation (base: rec {
meta = {
description = "An open source web browser from Google";
homepage = http://www.chromium.org/;
maintainers = with maintainers; [ bendlas ivan ];
maintainers = with maintainers; [ bendlas ];
license = if enableWideVine then licenses.unfree else licenses.bsd3;
platforms = platforms.linux;
hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
2 changes: 1 addition & 1 deletion pkgs/misc/scream-receivers/default.nix
View file
Original file line number Diff line number Diff line change
@@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/duncanthrax/scream";
license = licenses.mspl;
platforms = platforms.linux;
maintainers = [ maintainers.ivan ];
maintainers = with maintainers; [ ];
};
}
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/matomo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "matomo";
version = "3.13.0";
version = "3.13.1";

src = fetchurl {
url = "https://builds.matomo.org/matomo-${version}.tar.gz";
sha256 = "0h4jqibb86zw5l26r927qrbjhba8c79pc4xp3hgpi25p3fjncax8";
sha256 = "071m3sw3rrhlccbwdyklcn8rwp4mcnii5m2a7zmgx3rv87i9n2ni";
};

nativeBuildInputs = [ makeWrapper ];