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: 53eb2155e76e
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: 90159ed045b2
Choose a head ref

Commits on May 24, 2020

  1. ffmpeg_4: 4.2.2 -> 4.2.3

    zowoq committed May 24, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    Copy the full SHA
    0e38414 View commit details
  2. ffmpeg-full: 4.2.2 -> 4.2.3

    zowoq committed May 24, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    Copy the full SHA
    f7c914e View commit details
  3. ffmpeg_2_8: 2.8.15 -> 2.8.16

    zowoq committed May 24, 2020
    Copy the full SHA
    cfaa803 View commit details

Commits on May 26, 2020

  1. sad: use patch file extension

    zowoq committed May 26, 2020
    Copy the full SHA
    cb4cc7a View commit details
  2. Copy the full SHA
    6fa13a7 View commit details
  3. Copy the full SHA
    1d38f9f View commit details
  4. zola: 0.10.1 -> 0.11.0

    Br1ght0ne committed May 26, 2020
    Copy the full SHA
    308185f View commit details
  5. bat: 0.15.1 -> 0.15.3

    lilyball committed May 26, 2020
    Copy the full SHA
    e3f1712 View commit details
  6. Copy the full SHA
    ad77631 View commit details

Commits on May 27, 2020

  1. Copy the full SHA
    2842814 View commit details
  2. Merge pull request #88991 from lilyball/bat

    bat: 0.15.1 -> 0.15.3
    marsam authored May 27, 2020
    Copy the full SHA
    3d8f69d View commit details
  3. Merge pull request #88993 from zowoq/gh-makefile

    gitAndTools.gh: 0.8.0 -> 0.9.0
    marsam authored May 27, 2020
    Copy the full SHA
    4eee2a0 View commit details
  4. Merge pull request #88987 from filalex77/zola-0.11.0

    zola: 0.10.1 -> 0.11.0
    marsam authored May 27, 2020
    Copy the full SHA
    260b2af View commit details
  5. ip2unix: 2.1.1 -> 2.1.2

    This fixes the issues with glibc 2.30, which were caused because glibc
    no longer allows to dlopen/LD_PRELOAD a PIE executable.
    
    So this release is essentially just a hotfix release which addresses
    this issue by splitting the executable and library.
    
    Signed-off-by: aszlig <aszlig@nix.build>
    Reported-by: @zimbatm
    aszlig committed May 27, 2020
    Copy the full SHA
    b51d39f View commit details
  6. Merge pull request #88996 from r-ryantm/auto-update/python2.7-phonenu…

    …mbers
    
    python27Packages.phonenumbers: 8.12.2 -> 8.12.4
    marsam authored May 27, 2020
    Copy the full SHA
    7da72d5 View commit details
  7. Merge pull request #88561 from zowoq/ffmpeg

    ffmpeg{_4,-full}: 4.2.2 -> 4.2.3, ffmpeg_2_8: 2.8.15 -> 2.8.16
    marsam authored May 27, 2020
    Copy the full SHA
    6050c0b View commit details
  8. python27Packages.plexapi: 3.4.0 -> 3.6.0

    r-ryantm authored and Jon committed May 27, 2020
    Copy the full SHA
    d29b1f2 View commit details
  9. python27Packages.identify: 1.4.15 -> 1.4.16

    r-ryantm authored and Jon committed May 27, 2020
    Copy the full SHA
    8856efb View commit details
  10. python27Packages.update_checker: 0.16 -> 0.17

    r-ryantm authored and Jon committed May 27, 2020
    Copy the full SHA
    2be266c View commit details
  11. python27Packages.w3lib: 1.21.0 -> 1.22.0

    r-ryantm authored and Jon committed May 27, 2020
    Copy the full SHA
    05d7c27 View commit details
  12. Copy the full SHA
    660854a View commit details
  13. python37Packages.pyenchant: 3.0.1 -> 3.1.0

    r-ryantm authored and Jon committed May 27, 2020
    Copy the full SHA
    90159ed View commit details
Showing with 47 additions and 65 deletions.
  1. +3 −3 pkgs/applications/misc/zola/default.nix
  2. +1 −1 pkgs/applications/science/logic/sad/default.nix
  3. 0 pkgs/applications/science/logic/sad/{patch → patch.patch}
  4. +11 −9 pkgs/applications/version-management/git-and-tools/gh/default.nix
  5. +3 −3 pkgs/development/libraries/ffmpeg-full/default.nix
  6. +2 −2 pkgs/development/libraries/ffmpeg/2.8.nix
  7. +2 −2 pkgs/development/libraries/ffmpeg/4.nix
  8. +1 −1 pkgs/development/libraries/physics/cernlib/default.nix
  9. 0 pkgs/development/libraries/physics/cernlib/{patch → patch.patch}
  10. +2 −2 pkgs/development/python-modules/identify/default.nix
  11. +2 −2 pkgs/development/python-modules/phonenumbers/default.nix
  12. +2 −2 pkgs/development/python-modules/plexapi/default.nix
  13. +2 −2 pkgs/development/python-modules/pyenchant/default.nix
  14. +2 −2 pkgs/development/python-modules/update_checker/default.nix
  15. +2 −2 pkgs/development/python-modules/w3lib/default.nix
  16. +5 −5 pkgs/tools/graphics/transfig/default.nix
  17. 0 pkgs/tools/graphics/transfig/{patch-fig2dev-Imakefile → patch-fig2dev-Imakefile.patch}
  18. 0 pkgs/tools/graphics/transfig/{patch-fig2dev-dev-Imakefile → patch-fig2dev-dev-Imakefile.patch}
  19. 0 pkgs/tools/graphics/transfig/{patch-fig2dev-dev-gensvg.c → patch-fig2dev-dev-gensvg.c.patch}
  20. 0 pkgs/tools/graphics/transfig/{patch-fig2dev-fig2dev.h → patch-fig2dev-fig2dev.h.patch}
  21. 0 pkgs/tools/graphics/transfig/{patch-transfig-Imakefile → patch-transfig-Imakefile.patch}
  22. +5 −12 pkgs/tools/misc/bat/default.nix
  23. +0 −13 pkgs/tools/misc/bat/macos.patch
  24. +2 −2 pkgs/tools/networking/ip2unix/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/misc/zola/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "zola";
version = "0.10.1";
version = "0.11.0";

src = fetchFromGitHub {
owner = "getzola";
repo = pname;
rev = "v${version}";
sha256 = "07zg4ia983rgvgvmw4xbi347lr4rxlf1xv8rw72cflc74kyia67n";
sha256 = "137ak9gzcn3689fmcb90wa4szw43rh2m51mf26l77a5gksn5y6cn";
};

cargoSha256 = "13lnl01h8k8xv2ls1kjskfnyjmmk8iyk2mvbk01p2wmhp5m876md";
cargoSha256 = "0v40bcqh48dlhdc0kz7wm3q9r3i1m6j9s74bfiv237dqx5dymmsg";

nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ openssl ]
2 changes: 1 addition & 1 deletion pkgs/applications/science/logic/sad/default.nix
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
};
buildInputs = [ haskell.compiler.ghc844 spass ];
patches = [
./patch
./patch.patch
# Since the LTS 12.0 update, <> is an operator in Prelude, colliding with
# the <> operator with a different meaning defined by this package
./monoid.patch
20 changes: 11 additions & 9 deletions pkgs/applications/version-management/git-and-tools/gh/default.nix
Original file line number Diff line number Diff line change
@@ -2,25 +2,27 @@

buildGoModule rec {
pname = "gh";
version = "0.8.0";
version = "0.9.0";

src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "08fy3677yq52x40rab49ijhw4r25ls2807dbv9wpna6w07n7r8v7";
sha256 = "050wqjng0l42ilaiglwm1mzrrmnk0bg9icnzq9sm88axgl4xpmdy";
};

vendorSha256 = "0s99bjmsafnzhl3s2lcybxgsw1s4i1h3vh6p40gz4vsfhndidqrq";

buildFlagsArray = [
"-ldflags=-s -w -X github.com/cli/cli/command.Version=${version}"
];
nativeBuildInputs = [ installShellFiles ];

buildPhase = ''
make GH_VERSION=${version} bin/gh manpages
'';

subPackages = [ "cmd/gh" ];
installPhase = ''
install -Dm755 bin/gh -t $out/bin
installManPage share/man/*/*.[1-9]
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
for shell in bash fish zsh; do
$out/bin/gh completion -s $shell > gh.$shell
installShellCompletion gh.$shell
@@ -33,4 +35,4 @@ buildGoModule rec {
license = licenses.mit;
maintainers = with maintainers; [ zowoq ];
};
}
}
6 changes: 3 additions & 3 deletions pkgs/development/libraries/ffmpeg-full/default.nix
Original file line number Diff line number Diff line change
@@ -239,11 +239,11 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;

stdenv.mkDerivation rec {
pname = "ffmpeg-full";
version = "4.2.2";
version = "4.2.3";

src = fetchurl {
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
sha256 = "176jn1lcdf0gk7sa5l2mv0faqp5dsqdhx1gqcrgymqhfmdal4xfb";
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2";
sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1";
};

patches = [ ./prefer-libdav1d-over-libaom.patch ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/ffmpeg/2.8.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ callPackage, ... } @ args:

callPackage ./generic.nix (rec {
version = "${branch}.15";
version = "${branch}.16";
branch = "2.8";
sha256 = "08gf493a1ici1rn6gda6bxkcsk3fqbs6pdr0phcifjkd3xn7yr1m";
sha256 = "0lfmfd6rhywis9rblkxv33rpwfga9xv261fq4cn3pkx1izih7ybk";
} // args)
4 changes: 2 additions & 2 deletions pkgs/development/libraries/ffmpeg/4.nix
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
}@args:

callPackage ./generic.nix (rec {
version = "4.2.2";
version = "4.2.3";
branch = "4.2";
sha256 = "0p0f024rxrpk8pgmrprhfywq10rvdhrs0422wwcwlxkgqa3x285n";
sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
} // args)
2 changes: 1 addition & 1 deletion pkgs/development/libraries/physics/cernlib/default.nix
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gnumake imake makedepend ];
sourceRoot = ".";

patches = [ ./patch ];
patches = [ ./patch.patch ];

postPatch = ''
substituteInPlace 2006/src/config/site.def \
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/identify/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "identify";
version = "1.4.15";
version = "1.4.16";

src = fetchPypi {
inherit pname version;
sha256 = "1w6vy3nk28xhnamnmh7ddawprmb1ri2yw5s9lphmpq2hpfbqvh93";
sha256 = "19zk3qmcf0afbcbfnj7cmmgr47pxhjqwa1bfdc3fp60yy10kvbgr";
};

# Tests not included in PyPI tarball
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/phonenumbers/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "phonenumbers";
version = "8.12.2";
version = "8.12.4";

src = fetchPypi {
inherit pname version;
sha256 = "000vhxjlgvs0w3vywlgx1kq8wj0wk07ybnsdn1qwbamd06msvbb1";
sha256 = "021dc6kdzqh9kkrsbs08x3ibmfm4xr9hqvdnsji6l0knw1zrkia6";
};

meta = {
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/plexapi/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

buildPythonPackage rec {
pname = "PlexAPI";
version = "3.4.0";
version = "3.6.0";

src = fetchFromGitHub {
owner = "pkkid";
repo = "python-plexapi";
rev = version;
sha256 = "1y6mynsvkm9n2n927x8az9ch4blrjja7im9x7iyfrxahqgz0km77";
sha256 = "1lzp3367hmcpqwbkp4ckdv6hv37knwnwya88jicwl1smznpmjdfv";
};

propagatedBuildInputs = [ requests tqdm websocket_client ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pyenchant/default.nix
Original file line number Diff line number Diff line change
@@ -7,12 +7,12 @@

buildPythonPackage rec {
pname = "pyenchant";
version = "3.0.1";
version = "3.1.0";
disabled = isPy27;

src = fetchPypi {
inherit pname version;
sha256 = "0nfmckqm45fbfz795qw5hgvygdxgxchdiwp3kmm1k05z99j6mlhv";
sha256 = "14is5p40f516plzccwg6yf51zkja38abw46kybzwgyy94phr8i9b";
};

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

buildPythonPackage rec {
pname = "update_checker";
version = "0.16";
version = "0.17";

src = fetchPypi {
inherit pname version;
sha256 = "1f38l40d32dm0avcidf3dmikma8z0la84yngj88v4xygzi399qvh";
sha256 = "0qhfn5fjjab50gbnj2053wdfppzkydqgapfz35ymrm1vysvqvvrd";
};

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

buildPythonPackage rec {
pname = "w3lib";
version = "1.21.0";
version = "1.22.0";

src = fetchPypi {
inherit pname version;
sha256 = "05a3fxi4f43n0dc87lizsy2h84dxvqjy0q6rhkyabdbhypz5864b";
sha256 = "1pv02lvvmgz2qb61vz1jkjc04fgm4hpfvaj5zm4i3mjp64hd1mha";
};

buildInputs = [ six pytest ];
10 changes: 5 additions & 5 deletions pkgs/tools/graphics/transfig/default.nix
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@ stdenv.mkDerivation {
buildInputs = [ zlib libjpeg libpng ];

patches = [
./patch-fig2dev-dev-Imakefile
./patch-fig2dev-Imakefile
./patch-transfig-Imakefile
./patch-fig2dev-fig2dev.h
./patch-fig2dev-dev-gensvg.c
./patch-fig2dev-dev-Imakefile.patch
./patch-fig2dev-Imakefile.patch
./patch-transfig-Imakefile.patch
./patch-fig2dev-fig2dev.h.patch
./patch-fig2dev-dev-gensvg.c.patch
];

patchPhase = ''
17 changes: 5 additions & 12 deletions pkgs/tools/misc/bat/default.nix
Original file line number Diff line number Diff line change
@@ -1,32 +1,25 @@
{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, pkgconfig, less
{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, less
, Security, libiconv, installShellFiles, makeWrapper
}:

rustPlatform.buildRustPackage rec {
pname = "bat";
version = "0.15.1";
version = "0.15.3";

src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "v${version}";
sha256 = "10cs94ja1dmn0f24gqkcy8rf68b3b43k6qpbb5njbg0hcx3x6cyj";
sha256 = "0893xjnrjmhhzccfb57w5s7wlf6z4cwxvrxj8qb5jnmrgkfaw86b";
fetchSubmodules = true;
};

cargoSha256 = "13cphi08bp6lg054acgliir8dx2jajll4m3c4xxy04skmx555zr8";
cargoSha256 = "0mcff6nsd9g39xdhsf06zxs7pmq27nqfxdk0lwh83lqmnzdp01sf";

# Disable test that's broken on macOS.
# This should probably be removed on the next release.
# https://github.com/sharkdp/bat/issues/983
patches = [ ./macos.patch ];

nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ];
nativeBuildInputs = [ pkgconfig installShellFiles makeWrapper ];

buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ];

LIBCLANG_PATH = "${llvmPackages.libclang}/lib";

postInstall = ''
installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1
installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.fish
13 changes: 0 additions & 13 deletions pkgs/tools/misc/bat/macos.patch

This file was deleted.

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

stdenv.mkDerivation rec {
pname = "ip2unix";
version = "2.1.1";
version = "2.1.2";

src = fetchFromGitHub {
owner = "nixcloud";
repo = "ip2unix";
rev = "v${version}";
sha256 = "121ygj50i7ja9bv76y51qsjbjmmydhpi0sd3xb6pysmlzv0bxn17";
sha256 = "1ci0k3zy3hjkg65ah5h75mfvrd578xf2z1449xmgjm3iz3d6kqs2";
};

nativeBuildInputs = [