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: a0d7927a8c72
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: 2b0d0d96112c
Choose a head ref

Commits on May 18, 2020

  1. Copy the full SHA
    6cf4885 View commit details

Commits on May 19, 2020

  1. Copy the full SHA
    ebe21b1 View commit details
  2. parity: 2.7.2 -> 3.0.0

    r-ryantm committed May 19, 2020
    Copy the full SHA
    5b818c7 View commit details
  3. Copy the full SHA
    cdd95a9 View commit details
  4. Copy the full SHA
    3450729 View commit details
  5. powershell: 7.0.0 -> 7.0.1

    r-ryantm committed May 19, 2020
    Copy the full SHA
    cca31e2 View commit details

Commits on May 20, 2020

  1. tinygo: 0.13.0 -> 0.13.1

    r-ryantm committed May 20, 2020
    Copy the full SHA
    fdedbbf View commit details
  2. Copy the full SHA
    06e6909 View commit details
  3. toxiproxy: 2.1.3 -> 2.1.4

    bbigras committed May 20, 2020
    Copy the full SHA
    48a7f3b View commit details
  4. anydesk: 5.5.5 -> 5.5.6

    r-ryantm committed May 20, 2020
    Copy the full SHA
    108e001 View commit details
  5. timewarrior: 1.2.0 -> 1.3.0

    Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
    matthiasbeyer committed May 20, 2020
    Copy the full SHA
    bc14a22 View commit details
  6. cppcheck: 1.90 -> 2.0

    r-ryantm committed May 20, 2020
    Copy the full SHA
    2860036 View commit details
  7. Copy the full SHA
    2f3a4fe View commit details
  8. Merge pull request #88076 from mweinelt/dovecot

    dovecot: v2.3.10 → v2.3.10.1
    andir authored May 20, 2020
    Copy the full SHA
    f72b603 View commit details
  9. Merge pull request #88260 from matthiasbeyer/update-timewarrior

    timewarrior: 1.2.0 -> 1.3.0
    lsix authored May 20, 2020
    Copy the full SHA
    d0d68a9 View commit details
  10. Merge pull request #88206 from primeos/chromium

    chromium: 81.0.4044.138 -> 83.0.4103.61
    primeos authored May 20, 2020
    Copy the full SHA
    674c4f1 View commit details
  11. Merge pull request #88265 from r-ryantm/auto-update/cppcheck

    cppcheck: 1.90 -> 2.0
    Ma27 authored May 20, 2020
    Copy the full SHA
    8c9fe50 View commit details
  12. Copy the full SHA
    a42190f View commit details
  13. Copy the full SHA
    acfcd44 View commit details
  14. pre-commit: use buildPythonPackage

    Allows to build a python env with pre_commit module:
    
      python3.withPackages(p: [p.pre-commit])
    
    pre-commit is already converted to an application in `git-and-tools/default.nix`:
    
      pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;
    
    So that it can still be installed as a standalone application.
    eonpatapon authored and FRidh committed May 20, 2020
    Copy the full SHA
    ec46eaa View commit details
  15. Merge pull request #88212 from r-ryantm/auto-update/powershell

    powershell: 7.0.0 -> 7.0.1
    Ma27 authored May 20, 2020
    Copy the full SHA
    62c5ef0 View commit details
  16. Merge pull request #88331 from r-ryantm/auto-update/closure-compiler

    closurecompiler: 20200406 -> 20200517
    marsam authored May 20, 2020
    Copy the full SHA
    a33cf22 View commit details
  17. Merge pull request #88246 from bbigras/toxiproxy

    toxiproxy: 2.1.3 -> 2.1.4
    marsam authored May 20, 2020
    Copy the full SHA
    b0fee89 View commit details
  18. Merge pull request #88233 from r-ryantm/auto-update/tinygo

    tinygo: 0.13.0 -> 0.13.1
    marsam authored May 20, 2020
    Copy the full SHA
    4ce8a33 View commit details
  19. Merge pull request #88192 from r-ryantm/auto-update/mullvad-vpn

    mullvad-vpn: 2020.3 -> 2020.4
    ryantm authored May 20, 2020
    Copy the full SHA
    d42ba8c View commit details
  20. Merge pull request #88207 from r-ryantm/auto-update/parity

    parity: 2.7.2 -> 3.0.0
    ryantm authored May 20, 2020
    Copy the full SHA
    6723915 View commit details
  21. Merge pull request #88210 from r-ryantm/auto-update/picard-tools

    picard-tools: 2.22.4 -> 2.22.7
    ryantm authored May 20, 2020
    Copy the full SHA
    aae8733 View commit details
  22. Merge pull request #88257 from r-ryantm/auto-update/anydesk

    anydesk: 5.5.5 -> 5.5.6
    ryantm authored May 20, 2020
    Copy the full SHA
    f7bfba5 View commit details
  23. Copy the full SHA
    b3e7b6d View commit details
  24. Copy the full SHA
    439a904 View commit details
  25. linux: 4.4.223 -> 4.4.224

    NeQuissimus committed May 20, 2020
    Copy the full SHA
    ed37663 View commit details
  26. linux: 4.9.223 -> 4.9.224

    NeQuissimus committed May 20, 2020
    Copy the full SHA
    d2f98da View commit details
  27. linux: 5.4.41 -> 5.4.42

    NeQuissimus committed May 20, 2020
    Copy the full SHA
    2364627 View commit details
  28. linux: 5.6.13 -> 5.6.14

    NeQuissimus committed May 20, 2020
    Copy the full SHA
    c768dcf View commit details
  29. Copy the full SHA
    c2d6a3c View commit details
  30. Copy the full SHA
    858cce4 View commit details
  31. Merge pull request #88238 from r-ryantm/auto-update/vapoursynth-mvtools

    vapoursynth-mvtools: 22 -> 23
    rnhmjoj authored May 20, 2020
    Copy the full SHA
    fa65afd View commit details
  32. diffoscope: 143 -> 144

    r-ryantm committed May 20, 2020
    Copy the full SHA
    df5c1bc View commit details
  33. nauty: add meta.changelog

    timokau committed May 20, 2020
    Copy the full SHA
    a276c44 View commit details
  34. Copy the full SHA
    d0e1713 View commit details
  35. Merge pull request #88428 from timokau/nauty-27r1

    nauty: 26r12 -> 27r1
    timokau authored May 20, 2020
    Copy the full SHA
    b811d52 View commit details
  36. Merge pull request #88422 from filalex77/gitui-0.3.0

    gitAndTools.gitui: 0.2.5 -> 0.3.0
    Ma27 authored May 20, 2020
    Copy the full SHA
    3c7243d View commit details
  37. Merge pull request #88427 from r-ryantm/auto-update/diffoscope

    diffoscope: 143 -> 144
    Ma27 authored May 20, 2020
    Copy the full SHA
    2b0d0d9 View commit details
Showing with 87 additions and 69 deletions.
  1. +20 −0 .github/workflows/editorconfig.yml
  2. +3 −3 pkgs/applications/blockchains/parity/default.nix
  3. +2 −2 pkgs/applications/misc/timewarrior/default.nix
  4. +2 −5 pkgs/applications/networking/browsers/chromium/common.nix
  5. +1 −5 pkgs/applications/networking/browsers/chromium/default.nix
  6. +9 −9 pkgs/applications/networking/browsers/chromium/upstream-info.nix
  7. +2 −2 pkgs/applications/networking/mullvad-vpn/default.nix
  8. +2 −2 pkgs/applications/networking/remote/anydesk/default.nix
  9. +2 −2 pkgs/applications/science/biology/picard-tools/default.nix
  10. +6 −2 pkgs/applications/science/math/nauty/default.nix
  11. +3 −3 pkgs/applications/version-management/git-and-tools/gitui/default.nix
  12. +2 −2 pkgs/development/compilers/closure/default.nix
  13. +2 −2 pkgs/development/compilers/tinygo/default.nix
  14. +2 −2 pkgs/development/libraries/vapoursynth-mvtools/default.nix
  15. +2 −2 pkgs/development/python-modules/pre-commit/default.nix
  16. +2 −2 pkgs/development/tools/analysis/cppcheck/default.nix
  17. +2 −2 pkgs/development/tools/toxiproxy/default.nix
  18. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  19. +2 −2 pkgs/os-specific/linux/kernel/linux-4.19.nix
  20. +2 −2 pkgs/os-specific/linux/kernel/linux-4.4.nix
  21. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
  22. +2 −2 pkgs/os-specific/linux/kernel/linux-5.4.nix
  23. +2 −2 pkgs/os-specific/linux/kernel/linux-5.6.nix
  24. +4 −3 pkgs/servers/mail/dovecot/default.nix
  25. +2 −2 pkgs/shells/powershell/default.nix
  26. +3 −3 pkgs/shells/zsh/oh-my-zsh/default.nix
  27. +2 −2 pkgs/tools/misc/diffoscope/default.nix
20 changes: 20 additions & 0 deletions .github/workflows/editorconfig.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: editorconfig

on:
pull_request:
branches:
- master

jobs:
editorconfig:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: technote-space/get-diff-action@v1.2.8
- name: fetch image
run: docker pull mstruebing/editorconfig-checker
- name: editorconfig check
run: |
docker run --volume="$PWD":/check mstruebing/editorconfig-checker ec \
-disable-indentation \
${{ env.GIT_DIFF }}
6 changes: 3 additions & 3 deletions pkgs/applications/blockchains/parity/default.nix
Original file line number Diff line number Diff line change
@@ -10,16 +10,16 @@

rustPlatform.buildRustPackage rec {
pname = "parity";
version = "2.7.2";
version = "3.0.0";

src = fetchFromGitHub {
owner = "paritytech";
repo = "parity-ethereum";
rev = "v${version}";
sha256 = "09cvqk0h9c26famh3f1nc3g74cd0zk6klys977yr1f13bgqmzx0x";
sha256 = "124km8c2d7877yzd885wzlcl3gky15isx0z2l1qg1q3cqdsb5mjf";
};

cargoSha256 = "1fdymy8hvn137i5y4flyhlxwjxkd2cd6gq81i1429gk7j3h085ig";
cargoSha256 = "0m4pms7agfyqk6gz6fwxdl8jmcyhphhzh3x4vykbi6186y7a8ihq";

LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/applications/misc/timewarrior/default.nix
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

stdenv.mkDerivation rec {
pname = "timewarrior";
version = "1.2.0";
version = "1.3.0";

enableParallelBuilding = true;

src = fetchFromGitHub {
owner = "GothenburgBitFactory";
repo = "timewarrior";
rev = "v${version}";
sha256 = "0ci8kb7gdp1dsv6xj30nbz8lidrmn50pbriw26wv8mdhs17rfk7w";
sha256 = "1aijh1ad7gpa61cn7b57w24vy7fyjj0zx5k9z8d6m1ldzbw589cl";
fetchSubmodules = true;
};

7 changes: 2 additions & 5 deletions pkgs/applications/networking/browsers/chromium/common.nix
Original file line number Diff line number Diff line change
@@ -154,13 +154,10 @@ let
#
# ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ]
# ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
] ++ optionals (useVaapi) ([ # Fixes for the VA-API build:
] ++ optionals (useVaapi) [ # Improvements for the VA-API build:
./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi
./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium)
] ++ optionals (versionRange "81" "82") [
(githubPatch "5b2ff215473e0526b5b24aeff4ad90d369b21c75" "0n00vh8wfpn2ay5fqsxcsx0zadnv7mihm72bcvnrfzh75nzbg902")
(githubPatch "98e343ab369e4262511b5fce547728e3e5eefba8" "00wwp653jk0k0yvix00vr7ymgck9dj7fxjwx4nc67ynn84dh6064")
]);
];

postPatch = ''
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
6 changes: 1 addition & 5 deletions pkgs/applications/networking/browsers/chromium/default.nix
Original file line number Diff line number Diff line change
@@ -22,9 +22,7 @@
}:

let
llvmPackages = if channel != "stable"
then llvmPackages_10
else llvmPackages_9;
llvmPackages = llvmPackages_10;
stdenv = llvmPackages.stdenv;

callPackage = newScope chromium;
@@ -36,8 +34,6 @@ let

mkChromiumDerivation = callPackage ./common.nix ({
inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone;
gnChromium = gn;
} // lib.optionalAttrs (channel != "stable") {
# TODO: Remove after we can update gn for the stable channel (backward incompatible changes):
gnChromium = gn.overrideAttrs (oldAttrs: {
version = "2020-03-23";
18 changes: 9 additions & 9 deletions pkgs/applications/networking/browsers/chromium/upstream-info.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "0z9p4v5mkinf7hbdagh4bz6ymqjxg3df3wjpvm201ilzzngmjqz1";
sha256bin64 = "1srvlirhnynh0q2a17p8z13p7r54z0cchh1d1h07hqljnwmsf8qj";
version = "83.0.4103.34";
sha256 = "1g052h8g458qx04wbkz93j7hciw12b2b3w93x2849ag69q6g4qa9";
sha256bin64 = "0lkjl09vnj2bd1jry3awbg4z34vjnzd88p73a6x7pyrfq079l6vb";
version = "83.0.4103.61";
};
dev = {
sha256 = "178fc112bsbrgj2hss78y8rhnz8hl85fr33gawk9fz88zk5qz7xd";
sha256bin64 = "06qra245l2bbgxc3k04aabkgq1qnzybnrjhrjb25vriv31ji36b1";
version = "84.0.4128.3";
sha256 = "0f7m57acv79yzq3yg2xkchqqwisdgjv8h5xngp2i2v2md9jkfkbq";
sha256bin64 = "0b0w0nwa64gf99d617idjjgrjym3qc6p9h41kn5r9j2x46lxzply";
version = "84.0.4143.2";
};
stable = {
sha256 = "19kpzmqmld0m0nflx13w9flxfal19msnxhzl3lip1jqih65z4y7l";
sha256bin64 = "0sl4wv7npc3rhi7jgn679hi7j5ykzwpx5dahy78h87yfg4fx84wx";
version = "81.0.4044.138";
sha256 = "1g052h8g458qx04wbkz93j7hciw12b2b3w93x2849ag69q6g4qa9";
sha256bin64 = "1wji1ak6gi2a7lynxwvgpqsaz7zma9h2b9qbb5x3gzbv2dj37fmd";
version = "83.0.4103.61";
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/networking/mullvad-vpn/default.nix
Original file line number Diff line number Diff line change
@@ -41,11 +41,11 @@ in

stdenv.mkDerivation rec {
pname = "mullvad-vpn";
version = "2020.3";
version = "2020.4";

src = fetchurl {
url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb";
sha256 = "fac3896db78cc2ddac81abec8bc0aa324e66b453126ed35a501e422ce64b1362";
sha256 = "17xi8g2k89vi4d0j7pr33bx9zjapa2qh4pymbrqvxwli3yhq6zwr";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/applications/networking/remote/anydesk/default.nix
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@

let
sha256 = {
x86_64-linux = "09ajpsmgrgjhw7b91id76w84kwk2d678n0b81zzpwq7sgjcm0sb0";
x86_64-linux = "1vpfyffg1g7f1m4mxmqghswihml9rm1cipm7krmr5wvxdmcphxnk";
i386-linux = "0vjxbg5hwkqkh600rr75xviwy848r1xw9mxwf6bb6l8b0isvlsgg";
}.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported");

@@ -28,7 +28,7 @@ let

in stdenv.mkDerivation rec {
pname = "anydesk";
version = "5.5.5";
version = "5.5.6";

src = fetchurl {
urls = [
4 changes: 2 additions & 2 deletions pkgs/applications/science/biology/picard-tools/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "picard-tools";
version = "2.22.4";
version = "2.22.7";

src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
sha256 = "0gzna5df8nk42l7mc0qbp9h73gwr1030jnw10fawjp6ql6213kdd";
sha256 = "09q66lhjnprkw8azavwzwv9dlhr9b4x0dbz6fym0i2wbhylqp4w6";
};

nativeBuildInputs = [ makeWrapper ];
8 changes: 6 additions & 2 deletions pkgs/applications/science/math/nauty/default.nix
Original file line number Diff line number Diff line change
@@ -4,10 +4,10 @@
}:
stdenv.mkDerivation rec {
pname = "nauty";
version = "26r12";
version = "27r1";
src = fetchurl {
url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz";
sha256 = "1p4mxf8q5wm47nxyskxbqwa5p1vvkycv1zgswvnk9nsn6vff0al6";
sha256 = "1nym0p2djws8ylkpr0kgpxfa6fxdlh46cmvz0gn5vd02jzgs0aww";
};
outputs = [ "out" "dev" ];
configureFlags = {
@@ -37,6 +37,10 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
maintainers = with maintainers; [ raskin timokau ];
platforms = platforms.unix;
# I'm not sure if the filename will remain the same for future changelog or
# if it will track changes to minor releases. Lets see. Better than nothing
# in any case.
changelog = "http://pallini.di.uniroma1.it/changes24-27.txt";
homepage = "http://pallini.di.uniroma1.it/";
};
}
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "gitui";
version = "0.2.5";
version = "0.3.0";

src = fetchFromGitHub {
owner = "extrawurst";
repo = pname;
rev = "v${version}";
sha256 = "12zqsnkask2hhbvvyym4w21yx9rgwpqx2mnj6qds3y2qmcy1yhi4";
sha256 = "0rdaschf6030zprz81g7xnx57idjsq3bjhjp5d9387ha5njq0bp1";
};

cargoSha256 = "1kbaqpfj7b9asyyqjdljyga3v428yzlsgpnn9187hf4ydhpr6zrz";
cargoSha256 = "1k24xabhgwwdvslq81w6b8jnnjxbafj4s0zpcq2c4hals2xxwfy4";

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

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

stdenv.mkDerivation rec {
pname = "closure-compiler";
version = "20200406";
version = "20200517";

src = fetchurl {
url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
sha256 = "1dd6fakavnadpm8h8r4d1saf9flm7ilhknfy0q6i5i237psjf7i5";
sha256 = "05bbsrxw2nxjlcfc22w1ympi66jnmzymivg29cvidh5n28jgwba2";
};

sourceRoot = ".";
4 changes: 2 additions & 2 deletions pkgs/development/compilers/tinygo/default.nix
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@ let main = ./main.go;
in
buildGoModule rec {
pname = "tinygo";
version = "0.13.0";
version = "0.13.1";

src = fetchFromGitHub {
owner = "tinygo-org";
repo = "tinygo";
rev = "v${version}";
sha256 = "0x59j56y704m2hfkg78illgw9f6czrx265x887jfd989lnxphyqa";
sha256 = "0das5z5y2x1970yi9c4yssxvwrrjhdmsj495q0r5mb02amvc954v";
};

overrideModAttrs = (_: {
4 changes: 2 additions & 2 deletions pkgs/development/libraries/vapoursynth-mvtools/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "vapoursynth-mvtools";
version = "22";
version = "23";

src = fetchFromGitHub {
owner = "dubhater";
repo = "vapoursynth-mvtools";
rev = "v${version}";
sha256 = "11al56liaahkr3819iynq83k8n42wvijfv2ja5fsjdl6j4zfzpbr";
sha256 = "0lngkvxnzn82rz558nvl96rvclrck07ja1pny7wcfixp9b68ppkn";
};

nativeBuildInputs = [ pkgconfig ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pre-commit/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, fetchPypi, buildPythonApplication, pythonOlder
{ lib, fetchPypi, buildPythonPackage, pythonOlder
, aspy-yaml
, cached-property
, cfgv
@@ -13,7 +13,7 @@
, virtualenv
}:

buildPythonApplication rec {
buildPythonPackage rec {
pname = "pre-commit";
version = "1.21.0";

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

stdenv.mkDerivation rec {
pname = "cppcheck";
version = "1.90";
version = "2.0";

src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
sha256 = "10qqyvx44llbchwqjyipra0nzqqkb9majpp582ac55imc5b8sxa3";
sha256 = "0gssnb50cndr77xva4nar4a82ii0vfqy96dlm27gb7pd6xmd6xsz";
};

buildInputs = [ pcre ];
4 changes: 2 additions & 2 deletions pkgs/development/tools/toxiproxy/default.nix
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

buildGoPackage rec {
pname = "toxiproxy";
version = "2.1.3";
version = "2.1.4";
src = fetchFromGitHub {
owner = "Shopify";
repo = "toxiproxy";
rev = "v${version}";
sha256 = "1a7yry846iwi9cs9xam2vjbw73fjy45agjrwk214k0n1ziaawz2f";
sha256 = "07yhsvscdv1qjfc2fyyh9qsrrdwrrw04wadk5gaq4qddcway7vig";
};

goPackagePath = "github.com/Shopify/toxiproxy";
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.180";
version = "4.14.181";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "03pd4wpg526n391jwc0kbmbxi059mvq8d42a9qbym9mnv5rzjkj4";
sha256 = "0kaasqhmg9in7pf4ldk9z4z1cjgv1c9xdr1ca0pznngygibym6xb";
};
} // (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.123";
version = "4.19.124";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "0gwrkbbfy85ajxpg7q6j9mn8mzhmsr1v3wmh5c76p34d3b9i96d7";
sha256 = "005dznldnj1m03cbkc5pd2q2cv9jj1j6a0x2vh4p79ypg4c01nfm";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.4.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.4.223";
version = "4.4.224";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "09fln0sdfif2zv2jifp24yiqi0vcyj8fqx2jz91g21zvsxk3x5nd";
sha256 = "1lb8ypn558vk73bj4a20wq40cig9vmzjn2xzzdws78gfair6hxpg";
};
} // (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.223";
version = "4.9.224";
extraMeta.branch = "4.9";

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

buildLinux (args // rec {
version = "5.4.41";
version = "5.4.42";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "0mxhz3f0ayz0nggndbikp44kx307yxf16qzsv46hni6p8z1ffr0y";
sha256 = "0cdwazpzfrrb2y5fp87v9yihy7v8mlbqjzxpzmv7p83609y1nhsf";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.6.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.6.13";
version = "5.6.14";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "11zriz0jwqizv0pq0laql0svsnspdfnxqykq70v22x39iyfdf9gi";
sha256 = "18vyxi64i93v4qyky5q62kkasm1da7wmz91xfkx3j7ki84skyxik";
};
} // (args.argsOverride or {}))
7 changes: 4 additions & 3 deletions pkgs/servers/mail/dovecot/default.nix
Original file line number Diff line number Diff line change
@@ -9,7 +9,8 @@
}:

stdenv.mkDerivation rec {
name = "dovecot-2.3.10";
pname = "dovecot";
version = "2.3.10.1";

nativeBuildInputs = [ perl pkgconfig ];
buildInputs =
@@ -20,8 +21,8 @@ stdenv.mkDerivation rec {
++ lib.optional withSQLite sqlite;

src = fetchurl {
url = "https://dovecot.org/releases/2.3/${name}.tar.gz";
sha256 = "1ibiz3k2flablkcqbkvfzsjnq5b5kxximhcrplflsjl57mr88ca7";
url = "https://dovecot.org/releases/2.3/${pname}-${version}.tar.gz";
sha256 = "035idr2j81s5mngnhd58rih79dhwwak7q01mqbx3rcmi4cpychk6";
};

enableParallelBuilding = true;
4 changes: 2 additions & 2 deletions pkgs/shells/powershell/default.nix
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ let platformString = if stdenv.isDarwin then "osx"
else if stdenv.isLinux then "linux"
else throw "unsupported platform";
platformSha = if stdenv.isDarwin then "0c71w6z6sc86si07i6vy4w3069jal7476wyiizyr7qjm9m22963f"
else if stdenv.isLinux then "0m13y66a6w64s31qbi3j5x8jll6dfrin890jah8kyncsvlyisqg3"
else if stdenv.isLinux then "14d6nhv525pa8pi4p1r2mn180isfzgshqrbmql3qd55aksjpq1v0"
else throw "unsupported platform";
platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
else if stdenv.isLinux then "LD_LIBRARY_PATH"
@@ -15,7 +15,7 @@ let platformString = if stdenv.isDarwin then "osx"
in
stdenv.mkDerivation rec {
pname = "powershell";
version = "7.0.0";
version = "7.0.1";

src = fetchzip {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz";
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-05-18";
version = "2020-05-20";
pname = "oh-my-zsh";
rev = "4012df8fbb449bd551400c66f7602452bbae0bd1";
rev = "cfdd3c8dd87cd22281ec5d964ecb915bc9ad7e92";

src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
sha256 = "0pd39fgz9zqkzgpgpjp59vwq1px2clbsn1rz0cy3mhk85fhdbais";
sha256 = "018r9aq5s0lc5k8i8jp8w9qgp56acj4rmk9n43nfakr6ivhyjwmd";
};

pathsToLink = [ "/share/oh-my-zsh" ];
4 changes: 2 additions & 2 deletions pkgs/tools/misc/diffoscope/default.nix
Original file line number Diff line number Diff line change
@@ -9,11 +9,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "143";
version = "144";

src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "09vvhzsxxgjvdnd48hdfz50i2svacdnwc2idirj4b27czi7c3czb";
sha256 = "1n916k6z35c8ffksjjglkbl52jjhjv3899w230sg7k4ayzylj6zi";
};

outputs = [ "out" "man" ];