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: bb7e9e46a0da
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: 9dcc876b37ca
Choose a head ref

Commits on Mar 11, 2019

  1. python37Packages.pyroute2: 0.5.3 -> 0.5.4

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python3.7-pyroute2/versions
    r-ryantm committed Mar 11, 2019
    Copy the full SHA
    b08c370 View commit details

Commits on Mar 14, 2019

  1. Copy the full SHA
    531171e View commit details

Commits on Mar 19, 2019

  1. python.pkgs.mecab-python3: fix build

    Robert Schütz committed Mar 19, 2019
    Copy the full SHA
    06bcb5c View commit details
  2. python.pkgs.mecab-python3: correct meta

    Robert Schütz committed Mar 19, 2019
    Copy the full SHA
    deb20c1 View commit details

Commits on Mar 20, 2019

  1. Copy the full SHA
    d2370f5 View commit details
  2. Copy the full SHA
    beb6091 View commit details
  3. Copy the full SHA
    48343d0 View commit details
  4. newsboat: 2.14 -> 2.14.1

    Robert Schütz committed Mar 20, 2019
    Copy the full SHA
    6554944 View commit details
  5. Copy the full SHA
    aa5a41a View commit details
  6. thunderbird: 60.5.2 -> 60.6.0

    taku0 committed Mar 20, 2019
    Copy the full SHA
    3c83eb4 View commit details

Commits on Mar 21, 2019

  1. Copy the full SHA
    f292a2d View commit details
  2. Copy the full SHA
    9769393 View commit details
  3. Copy the full SHA
    283a124 View commit details
  4. autorandr: 1.7 -> 1.8

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/autorandr/versions
    r-ryantm committed Mar 21, 2019
    Copy the full SHA
    73d280e View commit details
  5. Merge pull request #57994 from betaboon/python-language-server-0.25.0

    Python language server 0.25.0
    Mic92 authored Mar 21, 2019
    Copy the full SHA
    25335d6 View commit details
  6. radare2-cutter: 1.7.2 -> 1.8.0

    Mic92 committed Mar 21, 2019
    Copy the full SHA
    18e67ab View commit details
  7. Merge pull request #58002 from ryantm/fix-apulse

    apulse: 0.1.11.1 -> 0.1.12, cleanup
    jagajaga authored Mar 21, 2019
    Copy the full SHA
    99c27fe View commit details
  8. Merge pull request #56011 from dasJ/tt-rss-feedly-all

    tt-rss-theme-feedly: Package additional themes
    Mic92 authored Mar 21, 2019
    Copy the full SHA
    e170276 View commit details
  9. Merge pull request #58013 from Mic92/radare2-cutter

    radare2-cutter: 1.7.2 -> 1.8.0
    Mic92 authored Mar 21, 2019
    Copy the full SHA
    cd5036c View commit details
  10. Merge pull request #58006 from r-ryantm/auto-update/autorandr

    autorandr: 1.7 -> 1.8
    Mic92 authored Mar 21, 2019
    Copy the full SHA
    709e94d View commit details
  11. Merge pull request #57997 from bernadinm/update_terraform_version

    terraform_0_11: 0.11.11 -> 0.11.13
    Mic92 authored Mar 21, 2019
    Copy the full SHA
    5594274 View commit details
  12. Merge pull request #57971 from dotlambda/newsboat-2.14.1

    newsboat: 2.14 -> 2.14.1
    dywedir authored Mar 21, 2019
    Copy the full SHA
    1985e76 View commit details
  13. chkrootkit: 0.52 -> 0.53

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/chkrootkit/versions
    r-ryantm committed Mar 21, 2019
    Copy the full SHA
    a37a0b5 View commit details
  14. Merge pull request #57904 from dotlambda/mecab-python3-fix

     python.pkgs.mecab-python3: fix build
    dotlambda authored Mar 21, 2019
    Copy the full SHA
    9107b4a View commit details
  15. Copy the full SHA
    19aaebe View commit details
  16. Merge pull request #57996 from taku0/thunderbird-bin-60.6.0

     thunderbird,  thunderbird-bin: 60.5.2 -> 60.6.0
    Mic92 authored Mar 21, 2019
    Copy the full SHA
    d0579fc View commit details
  17. Merge pull request #57993 from rencire/add-vim-tmux-navigator-plugin

    Added vim-tmux-navigator plugin to tmux-plugins
    Mic92 authored Mar 21, 2019
    Copy the full SHA
    0a0510f View commit details
  18. Merge pull request #58020 from r-ryantm/auto-update/chkrootkit

    chkrootkit: 0.52 -> 0.53
    Mic92 authored Mar 21, 2019
    Copy the full SHA
    b6a78f2 View commit details
  19. Merge pull request #57439 from r-ryantm/auto-update/python3.7-pyroute2

    python37Packages.pyroute2: 0.5.3 -> 0.5.4
    Mic92 authored Mar 21, 2019
    Copy the full SHA
    d2b8d85 View commit details
  20. Merge pull request #58003 from veprbl/pr/pyhepmc_fix

    pythonPackages.pyhepmc: fix build
    Mic92 authored Mar 21, 2019
    Copy the full SHA
    6b5c285 View commit details
  21. Copy the full SHA
    9dcc876 View commit details
2 changes: 1 addition & 1 deletion maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -1299,7 +1299,7 @@
name = "Tim Dysinger";
};
dywedir = {
email = "dywedir@protonmail.ch";
email = "dywedir@gra.red";
github = "dywedir";
name = "Vladyslav M.";
};
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/terraform/default.nix
Original file line number Diff line number Diff line change
@@ -88,8 +88,8 @@ let
plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"];
in rec {
terraform_0_11 = pluggable (generic {
version = "0.11.11";
sha256 = "1hsi5sibs0fk1620wzzxrc1gqjs6slqrjvlqcgvgg1yl22q9g7f5";
version = "0.11.13";
sha256 = "014d2ibmbp5yc1802ckdcpwqbm5v70xmjdyh5nadn02dfynaylna";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
18 changes: 13 additions & 5 deletions pkgs/applications/networking/feedreaders/newsboat/default.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
{ stdenv, rustPlatform, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
{ stdenv, rustPlatform, fetchurl, fetchpatch, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, Security, makeWrapper }:

rustPlatform.buildRustPackage rec {
name = "newsboat-${version}";
version = "2.14";
version = "2.14.1";

src = fetchurl {
url = "https://newsboat.org/releases/${version}/${name}.tar.xz";
sha256 = "13bdwnwxa66c69lqhb02basff0aa6q1jhl7fgahcxmdy7snbmg37";
sha256 = "0rnz61in715xgma6phvmn5bil618gic01f3kxzhcfgqsj2qx7l2b";
};

cargoSha256 = "11s50qy1b833r2b5kr1wx9imi9h7s00c0hs36ricgbd0xw7n76hd";
cargoSha256 = "05pf020jp20ffmvin6d1g8zbwf1zk03bm1cb99b7iqkk4r54g6dn";

prePatch = ''
cargoPatches = [
# Bump versions in Cargo.lock
(fetchpatch {
url = https://github.com/newsboat/newsboat/commit/cbad27a19d270f2f0fce9317651e2c9f0aa22865.patch;
sha256 = "05n31b6mycsmzilz7f3inkmav34210c4nlr1fna4zapbhxjdlhqn";
})
];

postPatch = ''
substituteInPlace Makefile --replace "|| true" ""
# Allow other ncurses versions on Darwin
substituteInPlace config.sh \

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -24,11 +24,11 @@ let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation rec {
name = "thunderbird-${version}";
version = "60.5.2";
version = "60.6.0";

src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 = "3q7h9jbxz7p7dh2dskmcqikpgd8czbmxknij063w02bh9lyffv6rasszl8pwz21mcylb9zzqjn29xl99g51sjx81555bdr38l8mjg55";
sha512 = "2s8h6z3rkylrclng1cpmj5dvsbhqymrdwvjy3g2s8rq66xca13wkyswdhgh8671d0dw9bmminikk53d2xqg7lqvvd1rdsminwscln4z";
};

# from firefox, but without sound libraries
15 changes: 11 additions & 4 deletions pkgs/development/python-modules/hglib/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, nose, mercurial, isPy3k }:
{ stdenv, buildPythonPackage, fetchPypi, substituteAll, python, nose, mercurial }:

buildPythonPackage rec {
pname = "python-hglib";
@@ -9,11 +9,18 @@ buildPythonPackage rec {
sha256 = "7c1fa0cb4d332dd6ec8409b04787ceba4623e97fb378656f7cab0b996c6ca3b2";
};

patches = [
(substituteAll {
src = ./hgpath.patch;
hg = "${mercurial}/bin/hg";
})
];

checkInputs = [ nose ];
buildInputs = [ mercurial ];

checkPhase = ''python test.py'';
doCheck = if isPy3k then false else true;
checkPhase = ''
${python.interpreter} test.py --with-hg "${mercurial}/bin/hg"
'';

meta = with stdenv.lib; {
description = "Mercurial Python library";
24 changes: 24 additions & 0 deletions pkgs/development/python-modules/hglib/hgpath.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff -r 2d0ec6097d78 hglib/__init__.py
--- a/hglib/__init__.py Mon Apr 30 15:43:29 2018 +0900
+++ b/hglib/__init__.py Tue Mar 19 23:30:01 2019 +0100
@@ -1,7 +1,7 @@
import subprocess
from hglib import client, util, error

-HGPATH = 'hg'
+HGPATH = '@hg@'

def open(path=None, encoding=None, configs=None):
'''starts a cmdserver for the given path (or for a repository found
diff -r 2d0ec6097d78 tests/common.py
--- a/tests/common.py Mon Apr 30 15:43:29 2018 +0900
+++ b/tests/common.py Tue Mar 19 23:30:01 2019 +0100
@@ -26,7 +26,7 @@
os.mkdir(self._testtmp)
os.chdir(self._testtmp)
# until we can run norepo commands in the cmdserver
- os.system('hg init')
+ os.system('@hg@ init')
self.client = hglib.open()

def tearDown(self):
14 changes: 10 additions & 4 deletions pkgs/development/python-modules/mecab-python3/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{ lib
, buildPythonPackage
, mecab
, fetchPypi
, mecab
, swig
}:

buildPythonPackage rec {
@@ -13,12 +14,17 @@ buildPythonPackage rec {
sha256 = "5aca4d0d196161e41452b89921042c0e61a6b7e7e9373211c0c1c50d1809055d";
};

propagatedBuildInputs = [ mecab ];
nativeBuildInputs = [
mecab # for mecab-config
swig
];

buildInputs = [ mecab ];

meta = with lib; {
description = "A python wrapper for mecab: Morphological Analysis engine";
homepage = https://github.com/LuminosoInsight/wordfreq/;
license = licenses.bsd0;
homepage = https://github.com/SamuraiT/mecab-python3;
license = with licenses; [ gpl2 lgpl21 bsd3 ]; # any of the three
maintainers = with maintainers; [ ixxie ];
};
}
17 changes: 15 additions & 2 deletions pkgs/development/python-modules/pyhepmc/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, fetchFromBitbucket
, isPy3k
, fetchurl
, pkgs
@@ -17,6 +18,18 @@ buildPythonPackage rec {
sha256 = "1210fd7e20d4abc1d9166147a9f7645a2a58b655fe030ad54ab3ea0d0c6e0834";
};

srcMissing = fetchFromBitbucket {
owner = "andybuckley";
repo = "pyhepmc";
rev = "pyhepmc-1.0.0";
sha256 = "0vxad143pz45q94w5p0dycpk24insdsv1m5k867y56xy24bi0d4w";
};

prePatch = ''
cp -r $srcMissing/hepmc .
chmod +w hepmc
'';

patches = [
# merge PR https://bitbucket.org/andybuckley/pyhepmc/pull-requests/1/add-incoming-outgoing-generators-for/diff
./pyhepmc_export_edges.patch
@@ -26,11 +39,11 @@ buildPythonPackage rec {

# regenerate python wrapper
preConfigure = ''
rm hepmc/hepmcwrap.py
swig -c++ -I${pkgs.hepmc}/include -python hepmc/hepmcwrap.i
'';

buildInputs = [ pkgs.swig pkgs.hepmc ];
nativeBuildInputs = [ pkgs.swig ];
buildInputs = [ pkgs.hepmc ];

HEPMCPATH = pkgs.hepmc;

4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pyroute2/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "pyroute2";
version = "0.5.3";
version = "0.5.4";

src = fetchPypi {
inherit pname version;
sha256 = "79f7b4286be773c46914df0201dabaf92717a9c06e341e0c420603b2dd31c6bf";
sha256 = "0w6z4j8l9898bj214v2mh7vx2g43j1b70ijjvc7q3316fscal469";
};

# requires root priviledges
Original file line number Diff line number Diff line change
@@ -5,15 +5,19 @@

buildPythonPackage rec {
pname = "python-jsonrpc-server";
version = "0.0.2";
version = "0.1.2";

src = fetchFromGitHub {
owner = "palantir";
repo = "python-jsonrpc-server";
rev = version;
sha256 = "1xp6xipslw8d1yv05mjmhql07kz04ibci5psjrv6rapqi6jp4bgk";
sha256 = "0k55rpywghapk5db8dgp2jj5v5654q6m571s1gcz1mpn2qxkz69l";
};

postPatch = ''
sed -i 's/version=versioneer.get_version(),/version="${version}",/g' setup.py
'';

checkInputs = [
pytest mock pytestcov coverage
];
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@
, pycodestyle ? null
, pydocstyle ? null
, pyflakes ? null
, pylint ? null
, rope ? null
, yapf ? null
}:
@@ -20,13 +21,13 @@ in

buildPythonPackage rec {
pname = "python-language-server";
version = "0.21.2";
version = "0.25.0";

src = fetchFromGitHub {
owner = "palantir";
repo = "python-language-server";
rev = version;
sha256 = "11fvrpv1kymj2fzh8fhys4qk1xc64j1rbdrz252awyab7b3509i7";
sha256 = "10la48m10j4alfnpw0xw359fb833scf5kv7kjvh7djf6ij7cfsvq";
};

# The tests require all the providers, disable otherwise.
@@ -49,6 +50,7 @@ buildPythonPackage rec {
++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle
++ stdenv.lib.optional (withProvider "pydocstyle") pydocstyle
++ stdenv.lib.optional (withProvider "pyflakes") pyflakes
++ stdenv.lib.optional (withProvider "pylint") pylint
++ stdenv.lib.optional (withProvider "rope") rope
++ stdenv.lib.optional (withProvider "yapf") yapf
++ stdenv.lib.optional isPy27 configparser
4 changes: 2 additions & 2 deletions pkgs/development/tools/analysis/radare2/cutter.nix
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
, python3 }:

let
version = "1.7.2";
version = "1.8.0";
in
stdenv.mkDerivation rec {
name = "radare2-cutter-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "radareorg";
repo = "cutter";
rev = "v${version}";
sha256 = "09cqfz66r3830jkz1rwyfqw1xl1jfj6xg4pcccd2ml456kddh9dn";
sha256 = "1z3lpzl7k3qn5xabi0qxl83rdbwi00h45blnljx8yfw0am5vfphc";
};

postUnpack = "export sourceRoot=$sourceRoot/src";
18 changes: 9 additions & 9 deletions pkgs/development/tools/analysis/radare2/default.nix
Original file line number Diff line number Diff line change
@@ -110,7 +110,7 @@ in {
#<generated>
# DO NOT EDIT! Automatically generated by ./update.py
radare2 = generic {
version_commit = "20942";
version_commit = "21238";
gittap = "3.3.0";
gittip = "5a9127d2599c8ff61d8544be7d4c9384402e94a3";
rev = "3.3.0";
@@ -120,14 +120,14 @@ in {
cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
};
r2-for-cutter = generic {
version_commit = "20942";
gittap = "2.9.0-310-gcb62c376b";
gittip = "cb62c376bef6c7427019a7c28910c33c364436dd";
rev = "cb62c376bef6c7427019a7c28910c33c364436dd";
version = "2018-10-07";
sha256 = "0z4nr1d2ca8ibq34441j15pj22wh46brcbr00j5hcqvn8y2lh96l";
cs_ver = "e2c1cd46c06744beaceff42dd882de3a90f0a37c";
cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722";
version_commit = "21238";
gittap = "3.3.0";
gittip = "5a9127d2599c8ff61d8544be7d4c9384402e94a3";
rev = "5a9127d2599c8ff61d8544be7d4c9384402e94a3";
version = "3.3.0";
sha256 = "11ap3icr8w0y49lq5dxch2h589qdmwf3qv9lsdyfsz4l0mjm49ri";
cs_ver = "4.0.1";
cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
};
#</generated>
}
10 changes: 5 additions & 5 deletions pkgs/misc/apulse/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@
let oz = x: if x then "1" else "0"; in

stdenv.mkDerivation rec {
name = "apulse-${version}";
version = "0.1.11.1";
pname = "apulse";
version = "0.1.12";

src = fetchFromGitHub {
owner = "i-rinat";
repo = "apulse";
rev = "602b3a02b4b459d4652a3a0a836fab6f892d4080";
repo = pname;
rev = "v${version}";
sha256 = "0yk9vgb4aws8xnkhdhgpxp5c0rri8yq61yxk85j99j8ax806i3r8";
};

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "PulseAudio emulation for ALSA";
homepage = https://github.com/i-rinat/apulse;
homepage = "https://github.com/i-rinat/apulse";
license = licenses.mit;
platforms = platforms.linux;
maintainers = [ maintainers.jagajaga ];
9 changes: 9 additions & 0 deletions pkgs/misc/tmux-plugins/default.nix
Original file line number Diff line number Diff line change
@@ -228,6 +228,15 @@ in rec {
dependencies = [ pkgs.urlview ];
};

vim-tmux-navigator = mkDerivation {
pluginName = "vim-tmux-navigator";
src = fetchgit {
url = "https://github.com/christoomey/vim-tmux-navigator";
rev = "4e1a877f51a17a961b8c2a285ee80aebf05ccf42";
sha256 = "1b8sgbzl4pcpaabqk254n97mjz767ganrmqbsr6rqzz3j9a3s1fv";
};
};

yank = mkDerivation {
pluginName = "yank";
src = fetchgit {
2 changes: 1 addition & 1 deletion pkgs/servers/tt-rss/theme-feedly/default.nix
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
installPhase = ''
mkdir $out
cp -ra feedly feedly.css $out
cp -ra feedly *.css $out
'';

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/tools/misc/autorandr/default.nix
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

let
python = python3Packages.python;
version = "1.7";
version = "1.8";
in
stdenv.mkDerivation {
name = "autorandr-${version}";
@@ -48,7 +48,7 @@ in
owner = "phillipberndt";
repo = "autorandr";
rev = "${version}";
sha256 = "0wpiimc5xai813h7gywwp20svkn35pkw99bnjflmpwz7x8fn8dfz";
sha256 = "0yhn3gvvkgmfqf3yl3kqlj0biinw0qvli6s88sxa0pybca3j8nll";
};

meta = {
4 changes: 2 additions & 2 deletions pkgs/tools/security/chkrootkit/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:

stdenv.mkDerivation rec {
name = "chkrootkit-0.52";
name = "chkrootkit-0.53";

src = fetchurl {
url = "ftp://ftp.pangeia.com.br/pub/seg/pac/${name}.tar.gz";
sha256 = "04d2yxpy99y90rvrlc9fqmlffs6iyfbghxbhvv12j1xfr2ww0y65";
sha256 = "1da5ry3p7jb6xs6xlfml1ly09q2rs5q6n5axif17d29k7gixlqkj";
};

# TODO: a lazy work-around for linux build failure ...