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: 5dff8e981887
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: 18d02738770f
Choose a head ref
  • 20 commits
  • 14 files changed
  • 7 contributors

Commits on May 11, 2019

  1. riot-web: 1.0.8 -> 1.1.0

    nyanloutre committed May 11, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    sxzz Kevin Deng 三咲智子
    Copy the full SHA
    adc9db2 View commit details
  2. Copy the full SHA
    ed244ef View commit details
  3. yarn: 1.15.2 -> 1.16.0

    Milan Pässler committed May 11, 2019
    Copy the full SHA
    b4f6b5d View commit details
  4. chessx: 1.4.6 -> 1.5.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/chessx/versions
    r-ryantm committed May 11, 2019
    Copy the full SHA
    55c4e20 View commit details
  5. ffmpeg-full: nvenc doesn't imply nonfree licensing

    (cherry picked from commit ce211e6)
    jacereda authored and vcunat committed May 11, 2019
    Copy the full SHA
    de5e115 View commit details
  6. nvenc: remove obsolete nvidia-video-sdk

    (cherry picked from commit b869a42)
    jacereda authored and vcunat committed May 11, 2019
    Copy the full SHA
    f96ce31 View commit details
  7. nv-codec-headers: fix license

    (cherry picked from commit 65c52e1)
    jacereda authored and vcunat committed May 11, 2019
    Copy the full SHA
    9efdc75 View commit details
  8. Merge ffmpeg-full: nvenc doesn't imply nonfree licensing

    It's a port of #55442 to master.
    vcunat committed May 11, 2019
    Copy the full SHA
    b1565e5 View commit details
  9. ffmpeg-full: enable nvenc by default

    It's called "full", after all, and nvenc seem quite cheap actually.
    Also remove an unused parameter.
    vcunat committed May 11, 2019
    Copy the full SHA
    9fda860 View commit details
  10. ffmpeg-full: fix the build phase

    I was surprised the build is so slow, and I see it's single-threaded
    due to all work being done in install phase :-/
    Please, do *not* rewrite phases unless you're really confident it's
    a good approach; typically postFoo and preFoo is much better.
    
    I considered filing this ffmpeg-related string of changes as a PR,
    but in the end it doesn't seem likely to need review and we have too
    many PRs as it is...
    vcunat committed May 11, 2019
    Copy the full SHA
    5236232 View commit details
  11. Merge pull request #61274 from petabyteboy/feature/update-yarn

    yarn: 1.15.2 -> 1.16.0
    Ma27 authored May 11, 2019
    Copy the full SHA
    0015e88 View commit details
  12. Merge pull request #61277 from r-ryantm/auto-update/chessx

    chessx: 1.4.6 -> 1.5.0
    Ma27 authored May 11, 2019
    Copy the full SHA
    87fa21d View commit details
  13. Merge pull request #61275 from nyanloutre/riot_update_1_1_0

    riot-{web,desktop}: 1.0.8 -> 1.1.0
    Ma27 authored May 11, 2019
    Copy the full SHA
    88b32c7 View commit details
  14. Copy the full SHA
    659c6ab View commit details
  15. linux: 4.19.41 -> 4.19.42

    NeQuissimus committed May 11, 2019
    Copy the full SHA
    2a78d62 View commit details
  16. linux: 4.9.174 -> 4.9.175

    NeQuissimus committed May 11, 2019
    Copy the full SHA
    fe65f45 View commit details
  17. linux: 5.0.14 -> 5.0.15

    NeQuissimus committed May 11, 2019
    Copy the full SHA
    c058fb9 View commit details
  18. linux: 5.1 -> 5.1.1

    NeQuissimus committed May 11, 2019
    Copy the full SHA
    9038594 View commit details
  19. Copy the full SHA
    95d0ad9 View commit details
  20. Copy the full SHA
    18d0273 View commit details
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "1.0.8",
"version": "1.1.0",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {
Original file line number Diff line number Diff line change
@@ -7,12 +7,12 @@ with (import ./yarn2nix.nix { inherit pkgs; });

let
executableName = "riot-desktop";
version = "1.0.8";
version = "1.1.0";
riot-web-src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-web";
rev = "v${version}";
sha256 = "1krp608wxff1siih8zknc425n0qb6qjzf854fnp7qyjp1cnfc9sb";
sha256 = "0h1rr70jg64v824k31mvb93nfssr572xlyicc8yh91bl7hdh342x";
};

in mkYarnPackage rec {
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@
let configFile = writeText "riot-config.json" conf; in
stdenv.mkDerivation rec {
name= "riot-web-${version}";
version = "1.0.8";
version = "1.1.0";

src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "010m8b4lfnfi70d4v205wk3i4xhnsz7zkrdqrvw3si14xqy6192r";
sha256 = "14ap57hv1c5nh17771l39inpa5yacpyckzqcmjlbrb57illakwrd";
};

installPhase = ''
10 changes: 4 additions & 6 deletions pkgs/development/libraries/ffmpeg-full/default.nix
Original file line number Diff line number Diff line change
@@ -97,8 +97,7 @@
, libXv ? null # Xlib support
, libXext ? null # Xlib support
, lzma ? null # xz-utils
, nvenc ? false, nvidia-video-sdk ? null, nv-codec-headers ? null # NVIDIA NVENC support
, callPackage # needed for NVENC to access external ffmpeg nvidia headers
, nvenc ? true, nv-codec-headers ? null # NVIDIA NVENC support
, openal ? null # OpenAL 1.1 capture support
#, opencl ? null # OpenCL code
, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
@@ -228,7 +227,6 @@ assert libxcbxfixesExtlib -> libxcb != null;
assert libxcbshapeExtlib -> libxcb != null;
assert openglExtlib -> libGLU_combined != null;
assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;

stdenv.mkDerivation rec {
name = "ffmpeg-full-${version}";
@@ -418,13 +416,13 @@ stdenv.mkDerivation rec {
++ optional ((isLinux || isFreeBSD) && libva != null) libva
++ optionals isLinux [ alsaLib libraw1394 libv4l ]
++ optional (isLinux && libmfx != null) libmfx
++ optionals nvenc [ nvidia-video-sdk nv-codec-headers ]
++ optional nvenc nv-codec-headers
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
MediaToolbox VideoDecodeAcceleration
libiconv cf-private /* For _OBJC_EHTYPE_$_NSException */ ];

# Build qt-faststart executable
buildPhase = optional qtFaststartProgram ''make tools/qt-faststart'';
buildFlags = [ "all" ]
++ optional qtFaststartProgram "tools/qt-faststart"; # Build qt-faststart executable

# Hacky framework patching technique borrowed from the phantomjs2 package
postInstall = optionalString qtFaststartProgram ''
2 changes: 1 addition & 1 deletion pkgs/development/libraries/nv-codec-headers/default.nix
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = {
description = "FFmpeg version of headers for NVENC";
homepage = http://ffmpeg.org/;
license = stdenv.lib.licenses.gpl3Plus;
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.MP2E ];
platforms = stdenv.lib.platforms.all;
};
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "jenkins-${version}";
version = "2.164.2";
version = "2.164.3";

src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "1pmya8g3gs5f9ibbgacdh5f6828jcrydw7v7xmg2j86kwc1vclf8";
sha256 = "03m5ykl6kqih9li2fhyq9rf8x8djaj2rgjd2p897zzw5j0grkbx8";
};

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

stdenv.mkDerivation rec {
pname = "yarn";
version = "1.15.2";
version = "1.16.0";

src = fetchzip {
url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
sha256 = "0gvg6m0mdppgjp5lg3mz1w19c1zsflhgldzx4hgm3rlrbx3rzmvr";
sha256 = "1ki518ppw7bka4bfgvsv9s8x785vy23nvi7ihsw6ivisrg5v0w7w";
};

buildInputs = [ nodejs ];
4 changes: 2 additions & 2 deletions pkgs/games/chessx/default.nix
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@

stdenv.mkDerivation rec {
name = "chessx-${version}";
version = "1.4.6";
version = "1.5.0";

src = fetchurl {
url = "mirror://sourceforge/chessx/chessx-${version}.tgz";
sha256 = "1vb838byzmnyglm9mq3khh3kddb9g4g111cybxjzalxxlc81k5dd";
sha256 = "09rqyra28w3z9ldw8sx07k5ap3sjlli848p737maj7c240rasc6i";
};

buildInputs = [
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.14.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.14.117";
version = "4.14.118";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0gzjp731fgasi3nq39zz27h1x6mkvc0hbwjhmn9gyzd7wwsa2md8";
sha256 = "05csfas10b3kfj6pn72skxpk211y36bdzk5x63n6dbxrsjmp6zb8";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.19.41";
version = "4.19.42";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "10j7f78220rswdvng2fpmsvri2pqx2hm7q3z2k2cnr2ca2b65plh";
sha256 = "09ns4qskl2drg0p9fajy7nbh55anj0qxl7smca9rfxfm21hdf2gq";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.9.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.9.174";
version = "4.9.175";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0n2qhvvphv45fckrhvcf58va8mv2j7pg7yvr2yxmbzvz0xlgv17w";
sha256 = "032h0zd3rxg34vyp642978pbx66gnx3sfv49qwvbzwlx3zwk916r";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.0.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.0.14";
version = "5.0.15";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0qbcczrrg3v7gm5x534h8fzasp53kimca3x3dzwc084arxv60drf";
sha256 = "01zb8lz1lxcff2j8yxzm0ayfazi07c2n7v1i3v8wbq8k9r2vhgjw";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.1.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.1";
version = "5.1.1";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0hghjkxgf1p8mfm04a9ckjvyrnp71jp3pbbp0qsx35rzwzk7nsnh";
sha256 = "1pcd0npnrjbc01rzmm58gh135w9nm5mf649asqlw50772qa9jkd0";
};
} // (args.argsOverride or {}))
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 = "2019-05-09";
version = "2019-05-11";
name = "oh-my-zsh-${version}";
rev = "f5f630ff342571097fd92f069ea5fe006599703d";
rev = "486fa1010df847bfd8823b4492623afc7c935709";

src = fetchgit { inherit rev;
url = "https://github.com/robbyrussell/oh-my-zsh";
sha256 = "1ndrampjzkrd4myc1gv733zvgag25zgby9mxny9jzj99mlqajzac";
sha256 = "097n64xzdqgqdbgcqnzsk0s9r9yn8ncqbixbsxgpcj29x9hi1dkn";
};

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