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: 4398e9e346c1
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: f3241e1b4379
Choose a head ref

Commits on Jun 22, 2020

  1. ameba: 0.12.1 -> 0.13.0

    kimburgess committed Jun 22, 2020
    Copy the full SHA
    06e5561 View commit details

Commits on Jun 23, 2020

  1. rakudo: 2020.05.1 -> 2020.06

    dependencies:
    nqp: 2020.05 -> 2020.06
    moarvm: 2020.05 -> 2020.06
    stigtsp committed Jun 23, 2020
    Copy the full SHA
    880695f View commit details
  2. discord: fix appindicator tray icon support

    Include libappindicator-gtk3 in discord's library path so it's able to
    create an indicator icon.
    benley committed Jun 23, 2020
    Copy the full SHA
    e6307b4 View commit details
  3. hstr: install manpage

    teto committed Jun 23, 2020
    Copy the full SHA
    dde159f View commit details
  4. python37Packages.quandl: fix build

    Jonathan Ringer committed Jun 23, 2020
    Copy the full SHA
    9fbbbf1 View commit details

Commits on Jun 24, 2020

  1. Copy the full SHA
    3c6bd16 View commit details
  2. Copy the full SHA
    27108e7 View commit details
  3. Merge pull request #91387 from gustavderdrache/fix-helm-build

    kubernetes-helm: Restore vendorSha256
    marsam authored Jun 24, 2020
    Copy the full SHA
    27b16dd View commit details
  4. Merge pull request #91354 from stigtsp/package/rakudo-2020.06

    rakudo: 2020.05.1 -> 2020.06
    marsam authored Jun 24, 2020
    Copy the full SHA
    e8e64a7 View commit details
  5. Copy the full SHA
    affeb15 View commit details
  6. Merge pull request #91389 from HugoReeves/master

    cargo-tarpaulin: 0.13.3 -> 0.13.4
    danieldk authored Jun 24, 2020
    Copy the full SHA
    e3cf1eb View commit details
  7. Merge pull request #91381 from teto/hstr

    hstr: install manpage
    danieldk authored Jun 24, 2020
    Copy the full SHA
    455fca0 View commit details
  8. Merge pull request #91375 from benley/benley/discord-systray

    discord: fix appindicator tray icon support
    danieldk authored Jun 24, 2020
    Copy the full SHA
    f21e6f1 View commit details
  9. Merge pull request #91262 from aca-labs/ameba

    ameba: 0.12.1 -> 0.13.0
    lsix authored Jun 24, 2020
    Copy the full SHA
    536aad5 View commit details
  10. Copy the full SHA
    97c886e View commit details
  11. Copy the full SHA
    490c75f View commit details
  12. Copy the full SHA
    06c483e View commit details
  13. xdg-desktop-portal: 1.6.0 -> 1.7.2

    betaboon authored and flokli committed Jun 24, 2020
    Copy the full SHA
    4a0b13b View commit details
  14. Copy the full SHA
    3521a47 View commit details
  15. Merge pull request #88598 from betaboon/xdg-desktop-portal-172

    xdg-desktop-portal: 1.6.0 -> 1.7.2
    flokli authored Jun 24, 2020
    Copy the full SHA
    5897105 View commit details
  16. just: 0.5.11 -> 0.6.0

    xrelkd committed Jun 24, 2020
    Copy the full SHA
    4ab300d View commit details
  17. Merge pull request #91397 from xrelkd/update/just

    just: 0.5.11 -> 0.6.0
    danieldk authored Jun 24, 2020
    Copy the full SHA
    c56e688 View commit details
  18. mp4v2: 2.0.0 -> 4.1.3

    Switch into maintanable fork. It is the community central fork.
    
    Remove old patch, use new minor upstream patch to compile.
    
    I weighted-in on the patch reasoning to be merged.
    
    Strictify hardening.
    
    Documentation update
    
    M  pkgs/development/libraries/mp4v2/default.nix
    Anton-Latukha committed Jun 24, 2020
    Copy the full SHA
    c281c84 View commit details
  19. Merge pull request #91159 from Anton-Latukha/upd-mp4v2-4.1.3

    mp4v2: 2.0.0 -> 4.1.3
    danieldk authored Jun 24, 2020
    Copy the full SHA
    d8d19f2 View commit details
  20. Copy the full SHA
    1ddbd8c View commit details
  21. Copy the full SHA
    f3241e1 View commit details
10 changes: 1 addition & 9 deletions pkgs/applications/misc/hstr/default.nix
Original file line number Diff line number Diff line change
@@ -15,15 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ readline ncurses gettext ];

configurePhase = ''
autoreconf -fvi
./configure
'';

installPhase = ''
mkdir -p $out/bin/
mv src/hstr $out/bin/
'';
configureFlags = [ "--prefix=$(out)" ];

meta = {
homepage = "https://github.com/dvorka/hstr";
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/vivaldi/default.nix
Original file line number Diff line number Diff line change
@@ -18,11 +18,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "3.0.1874.38-1";
version = "3.1.1929.45-1";

src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
sha256 = "03667f8rlk8shxq6ghjg4q9hqhsaw4gwpqnjpyili49qczd5423w";
sha256 = "0pg16zs9fcr6b360igszpkia3i8i5xf4m0hs1b2a17lf8vkldix9";
};

unpackPhase = ''
2 changes: 1 addition & 1 deletion pkgs/applications/networking/cluster/helm/default.nix
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ buildGoModule rec {
rev = "v${version}";
sha256 = "1453qkd9s4z4r0xzmv8ym7qfg33szf6gizfkb5zxj590fcbsgnd7";
};
vendorSha256 = null;
vendorSha256 = "0j25m56cwzjd9b75v7xlb26q81bsmln77k23h9n8v2f2gqwwpkrl";

subPackages = [ "cmd/helm" ];
buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ];
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb
, mesa, nspr, nss, pango, systemd
, mesa, nspr, nss, pango, systemd, libappindicator-gtk3
}:

let
@@ -35,6 +35,7 @@ in stdenv.mkDerivation rec {
gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
libXtst nspr nss libxcb pango systemd libXScrnSaver
libappindicator-gtk3
];

installPhase = ''
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/rakudo/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "rakudo";
version = "2020.05.1";
version = "2020.06";

src = fetchurl {
url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
sha256 = "1m4xpghhgi7iijbzvr7bzkay7k93bwpvdg58jp31csrwdzz4q5z1";
sha256 = "06kj8vfkkspmcdyd3zf2pyxwmijbbfnhv3jcaihvb8p3za5gxn2c";
};

buildInputs = [ icu zlib gmp perl ];
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/rakudo/moarvm.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
pname = "moarvm";
version = "2020.05";
version = "2020.06";

src = fetchurl {
url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz";
sha256 = "0jw29846nky7gz129knjcx58qr7nbn8j7hs8k92i11zaj73d4s4k";
sha256 = "1hlxm5p1n9fclma2z9kynkxrknsxdihzkbsb3wxnvjvndzqmk5yv";
};

buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/rakudo/nqp.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "nqp";
version = "2020.05";
version = "2020.06";

src = fetchurl {
url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz";
sha256 = "0xxm0vlra1g467cxc5v65p8pc46w7r9wkcddjl8nk2lnvgcr46r9";
sha256 = "13wkhdxxs86wl6ahfzhyp45dy6hk6qnij3dm8d8893b2rxs377m4";
};

buildInputs = [ perl ];
30 changes: 15 additions & 15 deletions pkgs/development/libraries/mp4v2/default.nix
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
{ stdenv, lib, fetchurl }:
{ stdenv, lib, fetchFromGitHub, fetchurl }:

stdenv.mkDerivation rec {
name = "mp4v2-2.0.0";

src = fetchurl {
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mp4v2/${name}.tar.bz2";
sha256 = "0f438bimimsvxjbdp4vsr8hjw2nwggmhaxgcw07g2z361fkbj683";
pname = "mp4v2";
version = "4.1.3";

src = fetchFromGitHub {
# 2020-06-20: THE current upstream, maintained and used in distros fork.
owner = "TechSmith";
repo = "mp4v2";
rev = "Release-ThirdParty-MP4v2-${version}";
sha256 = "053a0lgy819sbz92cfkq0vmkn2ky39bva554pj4ypky1j6vs04fv";
};

patches = [
(fetchurl {
name = "gcc-7.patch";
url = "https://src.fedoraproject.org/cgit/rpms/libmp4v2.git/plain/"
+ "0004-Fix-GCC7-build.patch?id=d7aeedabb";
# 2020-06-19: NOTE: # Fix build with C++11
# Close when https://github.com/TechSmith/mp4v2/pull/36 merged/closed.
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libmp4v2-c++11.patch?id=203f5a72bc97ffe089b424c47b07dd9eaea35713";
sha256 = "0sbn0il7lmk77yrjyb4f0a3z3h8gsmdkscvz5n9hmrrrhrwf672w";
})
];

buildFlags = [ "CXXFLAGS=-std=c++03" ];

# `faac' expects `mp4.h'.
postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h";

hardeningDisable = [ "format" ];

enableParallelBuilding = true;

meta = {
description = "Abandoned library. Provides functions to read, create, and modify mp4 files";
description = "Provides functions to read, create, and modify mp4 files";
longDescription = ''
MP4v2 library provides an API to work with mp4 files
as defined by ISO-IEC:14496-1:2001 MPEG-4 Systems.
This container format is derived from Apple's QuickTime format.
'';
homepage = "https://code.google.com/archive/p/mp4v2/";
homepage = "https://github.com/TechSmith/mp4v2";
maintainers = [ lib.maintainers.Anton-Latukha ];
platforms = lib.platforms.unix;
license = lib.licenses.mpl11;
4 changes: 2 additions & 2 deletions pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
Original file line number Diff line number Diff line change
@@ -13,13 +13,13 @@

stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-gtk";
version = "1.6.0";
version = "1.7.1";

src = fetchFromGitHub {
owner = "flatpak";
repo = pname;
rev = version;
sha256 = "1gpbjkfkrpk96krc1zbccrq7sih282mg303ifxaaxbnj6d8drm5h";
sha256 = "183iha9dxmvprn99ymgz17jx1lyn1fj5jyj6ghxl716zn9mxmird";
};

nativeBuildInputs = [
12 changes: 4 additions & 8 deletions pkgs/development/libraries/xdg-desktop-portal/default.nix
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
, pkgconfig
, libxml2
, glib
, pipewire_0_2
, pipewire
, fontconfig
, flatpak
, gsettings-desktop-schemas
@@ -21,15 +21,15 @@

stdenv.mkDerivation rec {
pname = "xdg-desktop-portal";
version = "1.6.0";
version = "1.7.2";

outputs = [ "out" "installedTests" ];

src = fetchFromGitHub {
owner = "flatpak";
repo = pname;
rev = version;
sha256 = "0fbsfpilwbv7j6cimsmmz6g0r96bw0ziwyk9z4zg2rd1mfkmmp9a";
sha256 = "0rkwpsmbn3d3spkzc2zsd50l2r8pp4la390zcpsawaav8w7ql7xm";
};

patches = [
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {

buildInputs = [
glib
pipewire_0_2
pipewire
fontconfig
flatpak
acl
@@ -61,10 +61,6 @@ stdenv.mkDerivation rec {
json-glib
];

# Seems to get stuck after "PASS: test-portals 39 /portal/inhibit/monitor"
# TODO: investigate!
doCheck = false;

configureFlags = [
"--enable-installed-tests"
];
4 changes: 2 additions & 2 deletions pkgs/development/ocaml-modules/dns/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

buildDunePackage rec {
pname = "dns";
version = "4.6.0";
version = "4.6.1";

minimumOCamlVersion = "4.07";

src = fetchurl {
url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz";
sha256 = "1gkswpc91j4ps60bp52ggg4qwj5g88f49x6p6d619p4x8vmhjylv";
sha256 = "0nsx98r2i1siz0yghnh87f2sq8w79if7ih9259yay1bp39crd6gd";
};

propagatedBuildInputs = [ rresult astring fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ];
58 changes: 0 additions & 58 deletions pkgs/development/ocaml-modules/lwt/legacy.nix

This file was deleted.

6 changes: 4 additions & 2 deletions pkgs/development/python-modules/quandl/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
lib, fetchPypi, buildPythonPackage, isPy3k,
lib, fetchPypi, buildPythonPackage, isPy3k, pythonOlder,
# runtime dependencies
pandas, numpy, requests, inflection, python-dateutil, six, more-itertools,
pandas, numpy, requests, inflection, python-dateutil, six, more-itertools, importlib-metadata,
# test suite dependencies
nose, unittest2, flake8, httpretty, mock, jsondate, parameterized, faker, factory_boy,
# additional runtime dependencies are required on Python 2.x
@@ -45,6 +45,8 @@ buildPythonPackage rec {
pyOpenSSL
ndg-httpsclient
pyasn1
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];

meta = with lib; {
4 changes: 2 additions & 2 deletions pkgs/development/tools/ameba/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

crystal.buildCrystalPackage rec {
pname = "ameba";
version = "0.12.1";
version = "0.13.0";

src = fetchFromGitHub {
owner = "crystal-ameba";
repo = "ameba";
rev = "v${version}";
sha256 = "0c2j2qki0czkpsqxv75qg95pk9f0w4rqa5ln07rs4bj9dk2lrr3l";
sha256 = "0h7s40xk7qmrc560k6vyx67lvimp74giwj21a43np0gcxq4f9icd";
};

meta = with stdenv.lib; {
6 changes: 3 additions & 3 deletions pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
Original file line number Diff line number Diff line change
@@ -2,21 +2,21 @@

rustPlatform.buildRustPackage rec {
pname = "cargo-tarpaulin";
version = "0.13.3";
version = "0.13.4";

src = fetchFromGitHub {
owner = "xd009642";
repo = "tarpaulin";
rev = "${version}";
sha256 = "1zc03frbag0lhxxbrdhip5h61ah16rqfcs314nyx7lfn3jd0gqzd";
sha256 = "094gkxdlydaqzmdy6a6az09yph102nd1fzwz6b12hg3vb50fxv7r";
};

nativeBuildInputs = [
pkgconfig
];
buildInputs = [ openssl ];

cargoSha256 = "15qf5hb6gm4lm1dcsqqs8nmd43m1qmw2g2zpj3c0abs5fbdz8k3a";
cargoSha256 = "0glcc4qmvz25p1zxx1igd37l2pb10i80kj5smafkgbczgn01iwk9";
#checkFlags = [ "--test-threads" "1" ];
doCheck = false;

9 changes: 4 additions & 5 deletions pkgs/development/tools/just/default.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash
, installShellFiles }:
{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }:

rustPlatform.buildRustPackage rec {
pname = "just";
version = "0.5.11";
version = "0.6.0";

src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = "v${version}";
sha256 = "0li5lspxfrim8gymqzzd5djjfbfi7jh1m234qlzy5vkx2q9qg0xv";
sha256 = "1sl235wr4fdsw0f0x7jynv6ljhvgis4d87xzpvjzajhdaappdp8d";
};

cargoSha256 = "1sp8xrh3gmgmphh1bv050p1ybjybk9x8kswyxz2rd93q3zb5hpzz";
cargoSha256 = "0k3aqwvdm95403s279gkksklnikgyjpf5qvngsvsrm5xqda438jk";

nativeBuildInputs = [ installShellFiles ];

6 changes: 3 additions & 3 deletions pkgs/shells/zsh/oh-my-zsh/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:

stdenv.mkDerivation rec {
version = "2020-06-19";
version = "2020-06-23";
pname = "oh-my-zsh";
rev = "b706a919172955e16a1ab97f36a95b9ee4d9f1dc";
rev = "cea89f54391c810198a7ace05f1063dd7e596bb7";

src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
sha256 = "01mf36ndzh657x8kx0fpq66zq7zf6bpiv2pg5zs7z0lglkm0x9xx";
sha256 = "091ws4q8rgd9gzim9x8v7rgx99lw1d8kym4r1r2jy7fdxfxh6z5k";
};

pathsToLink = [ "/share/oh-my-zsh" ];
Loading