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: ae94e8923240
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: c27460fc5b30
Choose a head ref
  • 18 commits
  • 11 files changed
  • 4 contributors

Commits on Dec 2, 2019

  1. zim: Fix missing icons

    tenaf0 committed Dec 2, 2019
    Copy the full SHA
    d28fcaa View commit details

Commits on Dec 9, 2019

  1. Copy the full SHA
    2aa0666 View commit details
  2. Copy the full SHA
    2932b28 View commit details
  3. Copy the full SHA
    045132d View commit details
  4. Copy the full SHA
    773fc7e View commit details

Commits on Dec 10, 2019

  1. xlockmore: 5.59 -> 5.60

    r-ryantm committed Dec 10, 2019
    Copy the full SHA
    4871f2d View commit details
  2. vips: 8.8.3 -> 8.8.4

    r-ryantm committed Dec 10, 2019
    Copy the full SHA
    83c6d2a View commit details
  3. Merge pull request #75415 from r-ryantm/auto-update/vips

    vips: 8.8.3 -> 8.8.4
    marsam authored Dec 10, 2019
    Copy the full SHA
    13b8749 View commit details
  4. Merge pull request #75371 from r-ryantm/auto-update/python3.8-pyftdi

    python38Packages.pyftdi: 0.30.3 -> 0.42.2
    marsam authored Dec 10, 2019
    Copy the full SHA
    467e948 View commit details
  5. Merge pull request #75370 from r-ryantm/auto-update/python3.8-pomegra…

    …nate
    
    python38Packages.pomegranate: 0.11.1 -> 0.11.2
    marsam authored Dec 10, 2019
    Copy the full SHA
    9527e91 View commit details
  6. Merge pull request #75357 from r-ryantm/auto-update/python3.8-Wand

    python38Packages.Wand: 0.5.7 -> 0.5.8
    marsam authored Dec 10, 2019
    Copy the full SHA
    c7879c9 View commit details
  7. Merge pull request #75341 from r-ryantm/auto-update/python3.8-funcy

    python38Packages.funcy: 1.13 -> 1.14
    marsam authored Dec 10, 2019
    Copy the full SHA
    286f43f View commit details
  8. python38Packages.Rtree: 0.8.3 -> 0.9.1

    r-ryantm authored and Jon committed Dec 10, 2019
    Copy the full SHA
    01370e4 View commit details
  9. Merge pull request #75408 from r-ryantm/auto-update/xlockmore

    xlockmore: 5.59 -> 5.60
    pSub authored Dec 10, 2019
    Copy the full SHA
    f57adb0 View commit details
  10. Merge pull request #74829 from tenaf0/zim-fix

    zim: Fix missing icons
    pSub authored Dec 10, 2019
    Copy the full SHA
    09dec10 View commit details
  11. python38Packages.pymupdf: 1.16.8 -> 1.16.9

    r-ryantm authored and Jon committed Dec 10, 2019
    Copy the full SHA
    00c9d6b View commit details
  12. python38Packages.astropy-healpix: 0.4 -> 0.5

    r-ryantm authored and Jon committed Dec 10, 2019
    Copy the full SHA
    a09dd9b View commit details
  13. python38Packages.nbdime: 1.0.7 -> 1.1.0

    r-ryantm authored and Jon committed Dec 10, 2019
    Copy the full SHA
    c27460f View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/office/zim/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook }:
{ stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome3 }:

#
# TODO: Declare configuration options for the following optional dependencies:
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
sha256 = "1n3gmg7g86s8iwcx0i7rvvfdfs1fzmc9awr9qzjd2rckw4bkxad1";
};

buildInputs = [ gtk3 gobject-introspection wrapGAppsHook ];
buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome3.adwaita-icon-theme ];
propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ];


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

buildPythonPackage rec {
pname = "Rtree";
version = "0.8.3";
version = "0.9.1";

src = fetchPypi {
inherit pname version;
sha256 = "0jc62jbcqqpjcwcly7l9zk25bg72mrxmjykpvfiscgln00qczfbc";
sha256 = "140j1vsbcj6sivq1b6pgkwm0czivx2x3d66mqq0d9ymg46njrzn9";
};

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

buildPythonPackage rec {
pname = "Wand";
version = "0.5.7";
version = "0.5.8";

src = fetchPypi {
inherit pname version;
sha256 = "0wvqzppflph3fkgkyv3k11ga28fv1g1bz8sbf227d7pql8c6ia8k";
sha256 = "0sjdlfhw1wdjqpmr72mckf2njy9xigx51shl510jhvl418cja2bd";
};

postPatch = ''
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/astropy-healpix/default.nix
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@

buildPythonPackage rec {
pname = "astropy-healpix";
version = "0.4";
version = "0.5";

doCheck = false; # tests require pytest-astropy

src = fetchPypi {
inherit pname version;
sha256 = "8c9709ac923759c92eca6d2e623e734d0f417eed40ba835b77d99dec09e51aa2";
sha256 = "1bfdq33mj6mwk5fkc6n23f9bc9z8j7kmvql3zchz4h58jskmvqas";
};

propagatedBuildInputs = [ numpy astropy astropy-helpers ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/funcy/default.nix
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

buildPythonPackage rec {
pname = "funcy";
version = "1.13";
version = "1.14";

src = fetchPypi {
inherit pname version;
sha256 = "1hxii7g4fn301vr8wg53jc1jkvbjlbaz1fbpgpn4362xcwzk73wi";
sha256 = "1i55c5kjvkb3y2jqfnlx3iirrd512mxjdhjpm1l2xya6nk1q9vkm";
};

# No tests
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/nbdime/default.nix
Original file line number Diff line number Diff line change
@@ -24,12 +24,12 @@

buildPythonPackage rec {
pname = "nbdime";
version = "1.0.7";
version = "1.1.0";
disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "28615cb92d59e0511026bac4c916f16dc15981bcad4ddc3f7fdd6a289ea01242";
sha256 = "0qfy7nmlg75vryvrlgd6p0rqrvcclq8n9kd0n4xv5959s9sjy0w0";
};

checkInputs = [
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pomegranate/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildPythonPackage rec {
pname = "pomegranate";
version = "0.11.1";
version = "0.11.2";

src = fetchFromGitHub {
repo = pname;
owner = "jmschrei";
rev = "v${version}";
sha256 = "19kdzqyj86aldsls68a6ymrs8sasv3a8r4wjmfdmcif1xsg6zb4q";
sha256 = "070ciwww1lhjmfwd5n1kcwgxwbgdfvmhjs4l156bnf08z9dlrafl";
};

propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pyftdi/default.nix
Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@

buildPythonPackage rec {
pname = "pyftdi";
version = "0.30.3";
version = "0.42.2";
disabled = pythonOlder "3.5";

src = fetchPypi {
inherit pname version;
sha256 = "ed55f0cb2d2f84b6e97be9583d582480ba9777cb0179aac0bb0ac480cd6760f5";
sha256 = "1bpb2rq7bc3p4g9qrfp4a7qcic79cvv1wh17j231bnpmy48njhvj";
};

propagatedBuildInputs = [ pyusb pyserial ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pymupdf/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPythonPackage, fetchPypi, mupdf, swig }:
buildPythonPackage rec {
pname = "PyMuPDF";
version = "1.16.8";
version = "1.16.9";

src = fetchPypi {
inherit pname version;
sha256 = "3099b48a796885c0760d8ac5439131dee1bc6adadf7ae008417e0ca8d8fcdf15";
sha256 = "09h960ns42bbrv10bg99fad193yvg64snhw8x7d78wg3qqvnnicc";
};

patchPhase = ''
4 changes: 2 additions & 2 deletions pkgs/misc/screensavers/xlockmore/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@
, libXdmcp, libXt }:

stdenv.mkDerivation rec {
name = "xlockmore-5.59";
name = "xlockmore-5.60";

src = fetchurl {
url = "http://sillycycle.com/xlock/${name}.tar.xz";
sha256 = "0lajc5a4lki33b9mzfsi74q4hbivbmhwysp7mib4ivnyxianhaid";
sha256 = "16v7y9g42a4g2dlhj5qfcax9ydg814zfxb8c9yj69c6kl51xdh79";
curlOpts = "--user-agent 'Mozilla/5.0'";
};

4 changes: 2 additions & 2 deletions pkgs/tools/graphics/vips/default.nix
Original file line number Diff line number Diff line change
@@ -10,13 +10,13 @@

stdenv.mkDerivation rec {
pname = "vips";
version = "8.8.3";
version = "8.8.4";

src = fetchFromGitHub {
owner = "libvips";
repo = "libvips";
rev = "v${version}";
sha256 = "0wlwcgcp7d3vhjdbi3xlpvnj4jl4321vac9v1sr1mis4aivwzsrn";
sha256 = "1gw8srjf5r6dhg6g5hh91if302mcr44dzy87mv230ar7027kwwbi";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''