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: e2920d957ac6
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: e04b6ecc6470
Choose a head ref
  • 10 commits
  • 9 files changed
  • 8 contributors

Commits on Mar 7, 2020

  1. pari: 2.11.2 -> 2.11.3

    r-ryantm committed Mar 7, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    siriobalmelli Sirio Balmelli
    Copy the full SHA
    6528554 View commit details

Commits on Mar 9, 2020

  1. bcc: 0.12.0 -> 0.13.0

    Mic92 committed Mar 9, 2020
    Copy the full SHA
    0bfada7 View commit details
  2. Copy the full SHA
    504bfe0 View commit details
  3. Unverified

    No user is associated with the committer email.
    Copy the full SHA
    f391999 View commit details
  4. Merge pull request #81950 from r-ryantm/auto-update/pari

    pari: 2.11.2 -> 2.11.3
    timokau authored Mar 9, 2020
    Copy the full SHA
    63ed2bf View commit details
  5. Merge pull request #82150 from r-ryantm/auto-update/python2.7-python-…

    …jenkins
    
    python27Packages.python-jenkins: 1.6.0 -> 1.7.0
    lsix authored Mar 9, 2020
    Copy the full SHA
    92a8bca View commit details
  6. Copy the full SHA
    4e58381 View commit details
  7. Merge pull request #82140 from Mic92/bcc

    bcc: 0.12.0 -> 0.13.0
    Mic92 authored Mar 9, 2020
    Copy the full SHA
    e73596d View commit details
  8. Copy the full SHA
    53998cb View commit details
  9. ocrmypdf: 9.6.0 -> 9.6.1

    r-ryantm authored and teto committed Mar 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    jojosch Johannes Schleifenbaum
    Copy the full SHA
    e04b6ec View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/science/math/pari/default.nix
Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@ assert withThread -> libpthreadstubs != null;

stdenv.mkDerivation rec {
pname = "pari";
version = "2.11.2";
version = "2.11.3";

src = fetchurl {
url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz";
sha256 = "0fck8ssmirl8fy7s4mspgrxjs5sag76xbshqlqzkcl3kqyrk4raa";
sha256 = "1jd65h2psrmba2dx7rkf5qidf9ka0cwbsg20pd18k45ggr30l467";
};

buildInputs = [
8 changes: 4 additions & 4 deletions pkgs/applications/version-management/gitlab/data.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"version": "12.8.2",
"repo_hash": "1d27s61kglryr5pashwfq55z7fh16fxkx1m4gc82xihwfzarf4x9",
"version": "12.8.5",
"repo_hash": "1y5606p793w1js39420jcd2bj42cripczgrdxgg2cq0r2kq8axk8",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v12.8.2-ee",
"rev": "v12.8.5-ee",
"passthru": {
"GITALY_SERVER_VERSION": "12.8.2",
"GITALY_SERVER_VERSION": "12.8.5",
"GITLAB_PAGES_VERSION": "1.16.0",
"GITLAB_SHELL_VERSION": "11.0.0",
"GITLAB_WORKHORSE_VERSION": "8.21.0"
Original file line number Diff line number Diff line change
@@ -28,14 +28,14 @@ let
};
});
in buildGoPackage rec {
version = "12.8.2";
version = "12.8.5";
pname = "gitaly";

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "1zc44y5yl799vqg12w3iaivk4xwj9i4k6f198svplipa760nl9ic";
sha256 = "19pwffncihhywfac7ybry38vyj3pmdz66g5nqrvwn4xxw7ypvd24";
};

# Fix a check which assumes that hook files are writeable by their
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab/gitaly/deps.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkgs/development/python-modules/XlsxWriter/default.nix
Original file line number Diff line number Diff line change
@@ -3,15 +3,15 @@
buildPythonPackage rec {

pname = "XlsxWriter";
version = "1.2.6";
version = "1.2.8";

# PyPI release tarball doesn't contain tests so let's use GitHub. See:
# https://github.com/jmcnamara/XlsxWriter/issues/327
src = fetchFromGitHub{
owner = "jmcnamara";
repo = pname;
rev = "RELEASE_${version}";
sha256 = "05y1py5mn1m65bbwhinzv84jd3xj8snvf2795flw0xbxnkn8nd8p";
sha256 = "18q5sxm9jw5sfavdjy5z0yamknwj5fl359jziqllkbj5k2i16lnr";
};

meta = {
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/python-jenkins/default.nix
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@

buildPythonPackage rec {
pname = "python-jenkins";
version = "1.6.0";
version = "1.7.0";

src = fetchPypi {
inherit pname version;
sha256 = "1aa6rnzlzdgndiwjdbnklgz5pqy5zd7d6g7bhzsvyf0614z1w010";
sha256 = "01jid5s09lr3kayr2h1z9n8h9nhyw3jxv9c4b5hrlxijknkqzvfy";
};

buildInputs = [ mock ];
@@ -32,7 +32,7 @@ buildPythonPackage rec {

meta = with lib; {
description = "Python bindings for the remote Jenkins API";
homepage = https://pypi.python.org/pypi/python-jenkins;
homepage = "https://pypi.python.org/pypi/python-jenkins";
license = licenses.bsd3;
maintainers = with maintainers; [ ma27 ];
};
5 changes: 1 addition & 4 deletions pkgs/misc/vim-plugins/overrides.nix
Original file line number Diff line number Diff line change
@@ -64,10 +64,7 @@ self: super: {
name = "LanguageClient-neovim-bin";
src = LanguageClient-neovim-src;

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "1w8g7pxwnjqp9zi47h4lz2mcg5daldsk5z72h8cjj750wng8a82c";
cargoSha256 = "0w66fcrlaxf6zgkrfpgfybfbm759fzimnr3pjq6sm14frar7lhr6";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];

# FIXME: Use impure version of CoreFoundation because of missing symbols.
13 changes: 5 additions & 8 deletions pkgs/os-specific/linux/bcc/default.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
{ stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages, kernel
{ stdenv, fetchurl, makeWrapper, cmake, llvmPackages, kernel
, flex, bison, elfutils, python, luajit, netperf, iperf, libelf
, systemtap, bash
}:

python.pkgs.buildPythonApplication rec {
version = "0.12.0";
version = "0.13.0";
name = "bcc-${version}";

src = fetchFromGitHub {
owner = "iovisor";
repo = "bcc";
rev = "v${version}";
sha256 = "1r2yjxam23k56prsvjhqf8i8d3irhcvmy0bly6x23h1jc3zc6yym";
fetchSubmodules = true;
src = fetchurl {
url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz";
sha256 = "15xpwf17x2j1c1wcb84cgfs35dp5w0rjd9mllmddmdjvn303wffx";
};
format = "other";

4 changes: 2 additions & 2 deletions pkgs/tools/text/ocrmypdf/default.nix
Original file line number Diff line number Diff line change
@@ -29,14 +29,14 @@ let

in buildPythonApplication rec {
pname = "ocrmypdf";
version = "9.6.0";
version = "9.6.1";
disabled = ! python3Packages.isPy3k;

src = fetchFromGitHub {
owner = "jbarlow83";
repo = "OCRmyPDF";
rev = "v${version}";
sha256 = "1cpj8fj1mzp6mbd1z9dj38fmlcg5q2gbya4vbag1ddd4vp7rvn2m";
sha256 = "0lbld11r8zds79183hh5y2f5fi7cacl7bx9f7f2g58j38y1c65vj";
};

nativeBuildInputs = with python3Packages; [