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: 5a7ab1963a95
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: 10c103614f30
Choose a head ref

Commits on Jun 17, 2019

  1. heimdal: 7.6.0 -> 7.7.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/heimdal/versions
    r-ryantm committed Jun 17, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vszakats Viktor Szakats
    Copy the full SHA
    831fcf8 View commit details

Commits on Jun 25, 2019

  1. pythonPackages.python-dotenv: 0.10.2 -> 0.10.3

    Jonathan Ringer committed Jun 25, 2019
    Copy the full SHA
    080b2fb View commit details

Commits on Jun 28, 2019

  1. Copy the full SHA
    63e6881 View commit details

Commits on Jul 1, 2019

  1. avfs: 1.0.6 -> 1.1.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/avfs/versions
    r-ryantm committed Jul 1, 2019
    Copy the full SHA
    da18457 View commit details
  2. bfs: 1.4.1 -> 1.5

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/bfs/versions
    r-ryantm committed Jul 1, 2019
    Copy the full SHA
    5da7c72 View commit details
  3. chicken: 5.0.0 -> 5.1.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/chicken/versions
    r-ryantm committed Jul 1, 2019
    Copy the full SHA
    ba189ee View commit details
  4. cppcheck: 1.87 -> 1.88

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/cppcheck/versions
    r-ryantm committed Jul 1, 2019
    Copy the full SHA
    dbf30c6 View commit details
  5. languagetool: 4.4 -> 4.6

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/languagetool/versions
    r-ryantm committed Jul 1, 2019
    Copy the full SHA
    f824fc8 View commit details

Commits on Jul 2, 2019

  1. i3pystatus: drop praw dependency

    praw is a reddit wrapper that sometimes poses problems when installing
    i3pystatus (twice in the past 6 months for me).
    As its usage should be relatively low, it should be fine to drop.
    users can go back the old behavior by overriding extraLibs
    teto committed Jul 2, 2019
    Copy the full SHA
    c9f651e View commit details
  2. Copy the full SHA
    95d9c2b View commit details
  3. python37Packages.vega: 2.1.0 -> 2.3.2

    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-vega/versions
    r-ryantm committed Jul 2, 2019
    Copy the full SHA
    f9f010e View commit details
  4. riemann: 0.3.2 -> 0.3.3

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/riemann/versions
    r-ryantm committed Jul 2, 2019
    Copy the full SHA
    2450a9b View commit details
  5. sassc: 3.6.0 -> 3.6.1

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/sassc/versions
    r-ryantm committed Jul 2, 2019
    Copy the full SHA
    3f7322c View commit details
  6. Merge pull request #63778 from jonringer/bump-python-dotenv

    pythonPackages.python-dotenv: 0.10.2 -> 0.10.3
    marsam authored Jul 2, 2019
    Copy the full SHA
    3e9c4fe View commit details
  7. Merge pull request #64202 from r-ryantm/auto-update/sassc

    sassc: 3.6.0 -> 3.6.1
    marsam authored Jul 2, 2019
    Copy the full SHA
    34b53f0 View commit details
  8. Merge pull request #64164 from r-ryantm/auto-update/python3.7-vega

    python37Packages.vega: 2.1.0 -> 2.3.2
    marsam authored Jul 2, 2019
    Copy the full SHA
    8077f40 View commit details
  9. Merge pull request #64153 from r-ryantm/auto-update/python3.7-robotfr…

    …amework-seleniumlibrary
    
    python37Packages.robotframework-seleniumlibrary: 3.2.0 -> 3.3.1
    marsam authored Jul 2, 2019
    Copy the full SHA
    4d50f8d View commit details

Commits on Jul 3, 2019

  1. Merge pull request #64001 from r-ryantm/auto-update/cppcheck

    cppcheck: 1.87 -> 1.88
    marsam authored Jul 3, 2019
    Copy the full SHA
    0dc4abf View commit details
  2. Merge pull request #63997 from r-ryantm/auto-update/chicken

    chicken: 5.0.0 -> 5.1.0
    marsam authored Jul 3, 2019
    Copy the full SHA
    bc9e0ef View commit details
  3. Merge pull request #63987 from r-ryantm/auto-update/bfs

    bfs: 1.4.1 -> 1.5
    marsam authored Jul 3, 2019
    Copy the full SHA
    90aea81 View commit details
  4. Merge pull request #63982 from r-ryantm/auto-update/avfs

    avfs: 1.0.6 -> 1.1.0
    marsam authored Jul 3, 2019
    Copy the full SHA
    17a5d31 View commit details
  5. Merge pull request #63878 from solson/plex-media-player-update

    plex-media-player: 2.23.0 -> 2.36.0
    aanderse authored Jul 3, 2019
    Copy the full SHA
    ed952d4 View commit details
  6. libtoxcore: 0.2.9 -> 0.2.10

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/libtoxcore/versions
    r-ryantm committed Jul 3, 2019
    Copy the full SHA
    07fc403 View commit details
  7. Merge pull request #63265 from r-ryantm/auto-update/heimdal

    heimdal: 7.6.0 -> 7.7.0
    marsam authored Jul 3, 2019
    Copy the full SHA
    6e97cdc View commit details
  8. typora: 0.9.70 -> 0.9.72

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/typora/versions
    r-ryantm committed Jul 3, 2019
    Copy the full SHA
    fae9047 View commit details
  9. Merge pull request #64217 from r-ryantm/auto-update/libtoxcore

    libtoxcore: 0.2.9 -> 0.2.10
    peterhoeg authored Jul 3, 2019
    Copy the full SHA
    87ec157 View commit details
  10. Merge pull request #64057 from r-ryantm/auto-update/LanguageTool

    languagetool: 4.4 -> 4.6
    marsam authored Jul 3, 2019
    Copy the full SHA
    88e3f4c View commit details
  11. Merge pull request #64198 from r-ryantm/auto-update/riemann

    riemann: 0.3.2 -> 0.3.3
    marsam authored Jul 3, 2019
    Copy the full SHA
    2852f4a View commit details
  12. Copy the full SHA
    b247ffd View commit details
  13. Merge pull request #64103 from teto/i3pystatus

    python3Packages.i3pystatus: drop praw and bump version
    teto authored Jul 3, 2019
    Copy the full SHA
    fb0d1c5 View commit details
  14. Merge pull request #64220 from r-ryantm/auto-update/typora

    typora: 0.9.70 -> 0.9.72
    worldofpeace authored Jul 3, 2019
    Copy the full SHA
    10c1036 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/editors/typora/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "typora";
version = "0.9.70";
version = "0.9.72";

src = fetchurl {
url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
sha256 = "08bgllbvgrpdkk9bryj4s16n274ps4igwrzdvsdbyw8wpp44vcy2";
sha256 = "0q7fj77pr3ykpwgip87h12qxvpvlzs15mi9w3phqm3p9mmm9rlrs";
};

nativeBuildInputs = [
22 changes: 11 additions & 11 deletions pkgs/applications/video/plex-media-player/default.nix
Original file line number Diff line number Diff line change
@@ -9,41 +9,41 @@ let
# plex-media-player is updated, the versions for these files are changed,
# so the build IDs (and SHAs) below will need to be updated!
depSrcs = rec {
webClientBuildId = "85-88b3ac67015f76";
webClientDesktopBuildId = "3.77.2-7015f76";
webClientTvBuildId = "3.78.0-88b3ac6";
webClientBuildId = "129-669a5eed7ae231";
webClientDesktopBuildId = "3.100.1-d7ae231";
webClientTvBuildId = "3.105.0-669a5ee";

webClient = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake";
sha256 = "0j7i4yr95ljw9cwyaygld41j7yvndj3dza3cbydv4x8mh2hn05v1";
sha256 = "0gd7x0rf7sf696zd24y6pji9iam851vjjqbpm4xkqwpadwrwzhwk";
};
webClientDesktopHash = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1";
sha256 = "106kx9ahz7jgskpjraff2g235n1whwvf18yw0nmp5dwr9ys9h8jp";
sha256 = "136hk7p6gxxmhq1d09jfjljkv76b5h2p16s5jwf28xixkp0ab2jg";
};
webClientDesktop = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz";
sha256 = "0h23h3fd3w43glvnhrg9qiajs0ql490kb00g3i4cpi29hy1ky45r";
sha256 = "0yvjqar72jq58jllsp51b8ybiv6kad8w51bfzss87m1cv3qdbzpa";
};
webClientTvHash = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1";
sha256 = "05zk2zpmcdf276ys5zyirsmvhvyvz99fa6hlgymma8ql6w67133r";
sha256 = "0kkw9dd0kr5n4ip1pwfs2dkfjwrph88i0dlw64dca9i885gyjvhd";
};
webClientTv = fetchurl {
url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz";
sha256 = "1cflpgaf4kyj6ccqa11j28rkp8s7zlbnid7s00m5n2c907dihmw2";
sha256 = "0yssii01nx6ixg3mikqjn8hz34dalma0rfr8spj115xwr7aq8ixk";
};
};
in stdenv.mkDerivation rec {
name = "plex-media-player-${version}";
version = "2.23.0.920";
vsnHash = "5bc1a2e5";
version = "2.36.0.988";
vsnHash = "0150ae52";

src = fetchFromGitHub {
owner = "plexinc";
repo = "plex-media-player";
rev = "v${version}-${vsnHash}";
sha256 = "1jzlyj32gr3ar89qnk8slazrbchqkjfx9dchzkzfvpi6742v9igm";
sha256 = "104arb0afv3jz0bvj8ij5s7av289ms9n91b4y4077la2wd6r1bq0";
};

nativeBuildInputs = [ pkgconfig cmake python3 ];
9 changes: 4 additions & 5 deletions pkgs/applications/window-managers/i3/pystatus.nix
Original file line number Diff line number Diff line change
@@ -3,19 +3,18 @@
python3Packages.buildPythonApplication rec {
# i3pystatus moved to rolling release:
# https://github.com/enkore/i3pystatus/issues/584
version = "unstable-2019-02-10";
version = "unstable-2019-06-10";
pname = "i3pystatus";
disabled = !python3Packages.isPy3k;

src = fetchFromGitHub
{
owner = "enkore";
repo = "i3pystatus";
rev = "bcd8f12b18d491029fdd5bd0f433b4500fcdc68e";
sha256 = "0gw6sla73cid6gwxn2n4zmsg2svq5flf9zxly6x2rfljizgf0720";
rev = "56ce08d0ff8d5d64950d6b588ebede35a95e0ce2";
sha256 = "12938860jbcly1xwhd71jvy2dff28pwv9kqh6mab1859148bzmcg";
};

propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++
propagatedBuildInputs = with python3Packages; [ keyring colour netifaces psutil basiciw ] ++
[ libpulseaudio ] ++ extraLibs;

libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ];
4 changes: 2 additions & 2 deletions pkgs/development/compilers/chicken/5/chicken.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }:

let
version = "5.0.0";
version = "5.1.0";
platform = with stdenv;
if isDarwin then "macosx"
else if isCygwin then "cygwin"
@@ -17,7 +17,7 @@ stdenv.mkDerivation {

src = fetchurl {
url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz";
sha256 = "15b5yrzfa8aimzba79x7v6y282f898rxqxfxrr446sjx9jwlpfd8";
sha256 = "0jsbp3kp0134f318j3wpd1n85gf8qzh034fn198gvazsv2l024aw";
};

setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh;
4 changes: 2 additions & 2 deletions pkgs/development/libraries/kerberos/heimdal.nix
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "heimdal-${version}";
version = "7.6.0";
version = "7.7.0";

src = fetchFromGitHub {
owner = "heimdal";
repo = "heimdal";
rev = "heimdal-${version}";
sha256 = "1i70xas6wddkw2840lk0ah9w6ddx0dzrslby1ggxlwfmcax8rcgp";
sha256 = "099qn9b8q20invvi5r8d8q9rnwpcm3nr89hx5rj7gj2ah2x5vgxs";
};

outputs = [ "out" "dev" "man" "info" ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libtoxcore/default.nix
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ in rec {
};

libtoxcore_0_2 = generic {
version = "0.2.9";
sha256 = "0aljr9hqybla6p61af6fdkv0x8gph7c2wacqqa9hq2z9w0p4fs5j";
version = "0.2.10";
sha256 = "0r5j2s5n8ikayvr1zylvv3ai3smbhm2m0yhpa9lfcsxhvyn9phcn";
};
}
21 changes: 17 additions & 4 deletions pkgs/development/python-modules/python-dotenv/default.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,28 @@
{ lib, buildPythonPackage, fetchPypi, click, ipython }:
{ lib, buildPythonPackage, fetchPypi, isPy27
, click
, ipython
, pytest
, sh
, typing
}:

buildPythonPackage rec {
pname = "python-dotenv";
version = "0.10.2";
version = "0.10.3";

src = fetchPypi {
inherit pname version;
sha256 = "6640acd76e6cab84648e4fec16c9d19de6700971f9d91d045e7120622167bfda";
sha256 = "0i25gh8wi87l4g0iflp81rlgmps4cdmp90hwypalp7gcbwfxfmzi";
};

checkInputs = [ click ipython ];
propagatedBuildInputs = [ click ] ++ lib.optionals isPy27 [ typing ];

checkInputs = [ ipython pytest sh ];

# cli tests are impure
checkPhase = ''
pytest tests/ -k 'not cli'
'';

meta = with lib; {
description = "Add .env support to your django/flask apps in development and deployments";
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }:

buildPythonPackage rec {
version = "3.2.0";
version = "3.3.1";
pname = "robotframework-seleniumlibrary";

# no tests included in PyPI tarball
src = fetchFromGitHub {
owner = "robotframework";
repo = "SeleniumLibrary";
rev = "v${version}";
sha256 = "106dl0qgf52wqk1xn4ghj7n2fjhaq0fh2wlnqn29aczbv5q581y3";
sha256 = "0dabc5dwx0pwsyiy74d7wj97k72yl28a17sasjzrdq819pyc3dvq";
};

propagatedBuildInputs = [ robotframework selenium ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/vega/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

buildPythonPackage rec {
pname = "vega";
version = "2.1.0";
version = "2.3.2";

src = fetchPypi {
inherit pname version;
sha256 = "0lshwsvi242m0ybrqjvbag73x1mrb31w2jq3lnklqyzry153xfdb";
sha256 = "0f39kfinn297gjhms9jys3ixdlsn0dz3gndgacyimp77jhzir4v1";
};

buildInputs = [ pytest ];
4 changes: 2 additions & 2 deletions pkgs/development/tools/analysis/cppcheck/default.nix
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

stdenv.mkDerivation rec {
pname = "cppcheck";
version = "1.87";
version = "1.88";
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
sha256 = "1jl1qlr8la1rix1ffcvl6s4arv2n9fvx85sl4zgp29428xks9c73";
sha256 = "1jiqv9pzzy2gxkdhxv3gqjarwgbvc7kxyc66dm3i6xwp94bl89dv";
};

buildInputs = [ pcre ];
4 changes: 2 additions & 2 deletions pkgs/development/tools/sassc/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "sassc";
version = "3.6.0";
version = "3.6.1";

src = fetchFromGitHub {
owner = "sass";
repo = pname;
rev = version;
sha256 = "14cbprnz70bv9qcs1aglvj9kkhf22as5xxz7gkv2ni8yjy8rp8q2";
sha256 = "1sxm54mkhs9m4vnl7vn11y17mhzamc403hv3966j1c7p2rbzg5pv";
};

patchPhase = ''
4 changes: 2 additions & 2 deletions pkgs/servers/monitoring/riemann/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "riemann-${version}";
version = "0.3.2";
version = "0.3.3";

src = fetchurl {
url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2";
sha256 = "0vq7yr048sqy8dgs9l3kn1q6s3hhlhs5551hj445cng8z6n4bc4v";
sha256 = "11xcmmp5k78vr5ch42zwx9ym84y6kf81z9zwawqybvx7wmlbpdiq";
};

nativeBuildInputs = [ makeWrapper ];
4 changes: 2 additions & 2 deletions pkgs/tools/filesystems/avfs/default.nix
Original file line number Diff line number Diff line change
@@ -2,10 +2,10 @@

stdenv.mkDerivation rec {
name = "avfs-${version}";
version = "1.0.6";
version = "1.1.0";
src = fetchurl {
url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2";
sha256 = "1hz39f7p5vw647xqk161v3nh88qnd599av6nfidpmkh1d9vkl6jc";
sha256 = "19rk2c0xd3mi66kr88ykrcn81fv09c09md0gf6mnm9z1bd7p7wx7";
};

nativeBuildInputs = [ pkgconfig ];
4 changes: 2 additions & 2 deletions pkgs/tools/system/bfs/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "bfs-${version}";
version = "1.4.1";
version = "1.5";

src = fetchFromGitHub {
repo = "bfs";
owner = "tavianator";
rev = version;
sha256 = "1y5w8gws4j1i334ap4rsl64scr0hlyrdkdl7ffaghs8fqa6mjmsb";
sha256 = "0lyrxbmfr4ckz4hx5dgz8xbq479l5rlyrqf205v6c82cap4zyv4x";
};

buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ];
4 changes: 2 additions & 2 deletions pkgs/tools/text/languagetool/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "LanguageTool-${version}";
version = "4.4";
version = "4.6";

src = fetchzip {
url = "https://www.languagetool.org/download/${name}.zip";
sha256 = "0cdrh59jcwrj5zp2lhbi9wp29pzabp35i8f7lbrs6z1wib6mgmp1";
sha256 = "1z3i6kz1dz7dw2ykyk1yamrv8h5h330sfyl037hhyy9hw6p30rhg";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];