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: 1834b4feed62
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: 7bd65a15f0e2
Choose a head ref

Commits on Jun 27, 2019

  1. cargo-make: 0.20.0 -> 0.21.0

    xrelkd committed Jun 27, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    43c779c View commit details

Commits on Jul 1, 2019

  1. cocoapods: 1.7.2 -> 1.7.3

    lilyball committed Jul 1, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    e005936 View commit details
  2. Copy the full SHA
    9ad722a View commit details
  3. docker-compose: 1.24.0 -> 1.24.1

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/docker-compose/versions
    r-ryantm committed Jul 1, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    4864de0 View commit details

Commits on Jul 2, 2019

  1. mkvtoolnix: 34.0.0 -> 35.0.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/mkvtoolnix/versions
    r-ryantm committed Jul 2, 2019
    Copy the full SHA
    df42799 View commit details
  2. parity: 2.4.8 -> 2.4.9

    xrelkd committed Jul 2, 2019
    Copy the full SHA
    6e001bc View commit details
  3. parity-beta: 2.5.3 -> 2.5.4

    xrelkd committed Jul 2, 2019
    Copy the full SHA
    21e7e22 View commit details
  4. pcm: 201710 -> 201902

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/pcm/versions
    r-ryantm committed Jul 2, 2019
    Copy the full SHA
    99020a4 View commit details
  5. python37Packages.dropbox: 9.3.0 -> 9.4.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/python3.7-dropbox/versions
    r-ryantm committed Jul 2, 2019
    Copy the full SHA
    06917a4 View commit details

Commits on Jul 3, 2019

  1. worker: 3.15.4 -> 4.0.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/worker/versions
    r-ryantm committed Jul 3, 2019
    Copy the full SHA
    beb4d8b View commit details
  2. Copy the full SHA
    05c9a3c View commit details
  3. Copy the full SHA
    5923cdd View commit details
  4. Merge pull request #64130 from r-ryantm/auto-update/python3.7-dropbox

    python37Packages.dropbox: 9.3.0 -> 9.4.0
    marsam authored Jul 3, 2019
    Copy the full SHA
    f88385d View commit details
  5. Merge pull request #64010 from r-ryantm/auto-update/docker-compose

    docker-compose: 1.24.0 -> 1.24.1
    marsam authored Jul 3, 2019
    Copy the full SHA
    6d3f847 View commit details
  6. Merge pull request #64084 from r-ryantm/auto-update/mkvtoolnix

    mkvtoolnix: 34.0.0 -> 35.0.0
    ryantm authored Jul 3, 2019
    Copy the full SHA
    83143ac View commit details
  7. Merge pull request #63989 from lilyball/cocoapods

    cocoapods: 1.7.2 -> 1.7.3
    marsam authored Jul 3, 2019
    Copy the full SHA
    b152f53 View commit details
  8. Merge pull request #64244 from marsam/fix-pytest-mock

    pythonPackages.pytest-mock: fix build
    marsam authored Jul 3, 2019
    Copy the full SHA
    b519801 View commit details
  9. Merge pull request #64106 from r-ryantm/auto-update/pcm

    pcm: 201710 -> 201902
    ryantm authored Jul 3, 2019
    Copy the full SHA
    67d7c59 View commit details
  10. Copy the full SHA
    b9fee38 View commit details
  11. Copy the full SHA
    bf9a276 View commit details
  12. linux: 5.1.15 -> 5.1.16

    NeQuissimus committed Jul 3, 2019
    Copy the full SHA
    d86f42a View commit details
  13. Merge pull request #64229 from r-ryantm/auto-update/worker

    worker: 3.15.4 -> 4.0.0
    marsam authored Jul 3, 2019
    Copy the full SHA
    56a0c7d View commit details
  14. Merge pull request #63846 from xrelkd/update/cargo-make

    cargo-make: 0.20.0 -> 0.21.0
    marsam authored Jul 3, 2019
    Copy the full SHA
    184f104 View commit details
  15. Copy the full SHA
    4a79bed View commit details
  16. Merge pull request #64094 from xrelkd/update/parity

    parity: 2.4.8 -> 2.4.9, parity-beta: 2.5.3 -> 2.5.4
    marsam authored Jul 3, 2019
    Copy the full SHA
    a1a45ba View commit details
  17. jsonnet: ship new jsonnetfmt binary

    nshalman authored and alyssais committed Jul 3, 2019
    Copy the full SHA
    7bd65a1 View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/altcoins/parity/beta.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
let
version = "2.5.3";
sha256 = "04z38ba4f1kmaa3d9b4gqz7dwr5blbppnkngw758xdm56772hfmj";
cargoSha256 = "03dlzl96g8k02lifymwp1xs0b2mrnj5c1xzpwp014ijqlnzcfgsv";
version = "2.5.4";
sha256 = "103kg0lrijf6d0mc1nk4pdgwgkmp9ga51rwfqrkkm133lylrr0lf";
cargoSha256 = "1w9p43v76igb62mbjk2rl7fynk13l4hpz25jd4f4hk5b2y2wf3r7";
in
import ./parity.nix { inherit version sha256 cargoSha256; }
6 changes: 3 additions & 3 deletions pkgs/applications/altcoins/parity/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
let
version = "2.4.8";
sha256 = "1kr7hzv27vxa14wafhpaq5a4fv97zh71xjjmwzaqq4gj3k9yj0rm";
cargoSha256 = "1yjyk6mhr3ws73aq6h8z5iabvj03ch7mxhkrfdkmhw3cjj0jgx6j";
version = "2.4.9";
sha256 = "0pj3yyjzc3fq0r7g8j22anzqxvm377pbcy27np1g7ygkzapzb2v6";
cargoSha256 = "1dxn00zxivmgk4a61nxwhjlv7fjsy2ngadyw0br1ssrkgz9k7af2";
in
import ./parity.nix { inherit version sha256 cargoSha256; }
4 changes: 2 additions & 2 deletions pkgs/applications/misc/worker/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "worker-${version}";
version = "3.15.4";
version = "4.0.0";

src = fetchurl {
url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz";
sha256 = "03zixi4yqcl05blyn09mlgk102yjbir8bp0yi4czd1sng0rhfc9x";
sha256 = "0cs1sq7zpp787r1irhqk5pmxa26rjz55mbgda4823z9zkzwfxy19";
};

buildInputs = [ libX11 ];
4 changes: 2 additions & 2 deletions pkgs/applications/video/mkvtoolnix/default.nix
Original file line number Diff line number Diff line change
@@ -12,13 +12,13 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "mkvtoolnix";
version = "34.0.0";
version = "35.0.0";

src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
sha256 = "189d23zqrk12w778x0cxp2mmc6gj9psb556ihkgs3r48jvs89sm6";
sha256 = "163msz6l1d5vwirr1c6cm820kwxcjinwh91svf8ddg5181nwhmrx";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/docker-compose/default.nix
Original file line number Diff line number Diff line change
@@ -6,12 +6,12 @@
, enum34, functools32, paramiko
}:
buildPythonApplication rec {
version = "1.24.0";
version = "1.24.1";
pname = "docker-compose";

src = fetchPypi {
inherit pname version;
sha256 = "0sd3bwmz80a2rffviq9vvyxic41ya08yj41k8x1m4vv74wcab0jm";
sha256 = "0lx7bx6jvhydbab8vwry0bclhdf0dfj6jrns1m5y45yp9ybqxmd5";
};

# lots of networking and other fails
4 changes: 2 additions & 2 deletions pkgs/development/beam-modules/hex/default.nix
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@ let

pkg = self: stdenv.mkDerivation rec {
pname = "hex";
version = "0.17.1";
version = "0.20.1";

src = fetchFromGitHub {
owner = "hexpm";
repo = "hex";
rev = "v${version}";
sha256 = "1s4asar1mcavzj3w37jcz243ka0z5jm0r42yws3h4aagawxxg02z";
sha256 = "0yxw7r31kk45b1nk48pajwwv9zl746kc9pwqfb73za8b1g8bgxd3";
};

setupHook = writeText "setupHook.sh" ''
2 changes: 2 additions & 0 deletions pkgs/development/compilers/jsonnet/default.nix
Original file line number Diff line number Diff line change
@@ -15,12 +15,14 @@ stdenv.mkDerivation rec {

makeFlags = [
"jsonnet"
"jsonnetfmt"
"libjsonnet.so"
];

installPhase = ''
mkdir -p $out/bin $out/lib $out/include
cp jsonnet $out/bin/
cp jsonnetfmt $out/bin/
cp libjsonnet*.so $out/lib/
cp -a include/*.h $out/include/
'';
8 changes: 4 additions & 4 deletions pkgs/development/mobile/cocoapods/Gemfile-beta.lock
Original file line number Diff line number Diff line change
@@ -9,10 +9,10 @@ GEM
tzinfo (~> 1.1)
atomos (0.1.3)
claide (1.0.2)
cocoapods (1.7.2)
cocoapods (1.7.3)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.7.2)
cocoapods-core (= 1.7.3)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -28,7 +28,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.10.0, < 2.0)
cocoapods-core (1.7.2)
cocoapods-core (1.7.3)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
@@ -45,7 +45,7 @@ GEM
colored2 (3.1.2)
concurrent-ruby (1.1.5)
escape (0.0.4)
fourflusher (2.3.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
i18n (0.9.5)
8 changes: 4 additions & 4 deletions pkgs/development/mobile/cocoapods/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -9,10 +9,10 @@ GEM
tzinfo (~> 1.1)
atomos (0.1.3)
claide (1.0.2)
cocoapods (1.7.2)
cocoapods (1.7.3)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.7.2)
cocoapods-core (= 1.7.3)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -28,7 +28,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.10.0, < 2.0)
cocoapods-core (1.7.2)
cocoapods-core (1.7.3)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
@@ -45,7 +45,7 @@ GEM
colored2 (3.1.2)
concurrent-ruby (1.1.5)
escape (0.0.4)
fourflusher (2.3.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
i18n (0.9.5)
12 changes: 6 additions & 6 deletions pkgs/development/mobile/cocoapods/gemset-beta.nix
Original file line number Diff line number Diff line change
@@ -46,21 +46,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hbz1i513prx3nk507h3jyfza71x9xa23921mm1qyq5874myiwi9";
sha256 = "0c0xh7wh8l34wqiiwwhdakm6zin8xd5svgh63c6pb2pd1d4phhyv";
type = "gem";
};
version = "1.7.2";
version = "1.7.3";
};
cocoapods-core = {
dependencies = ["activesupport" "fuzzy_match" "nap"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "051pfrr1y1a8mky1nzlgql6nvhq4lwpg689rn45gb6lii1vn3yr4";
sha256 = "0p76z708fbb61x0m585iaf912f0s3qw0a1mryhpqa2wyrjrlmg31";
type = "gem";
};
version = "1.7.2";
version = "1.7.3";
};
cocoapods-deintegrate = {
groups = ["default"];
@@ -169,10 +169,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b9kzw8pr7bg67fqvv7x6xdknyfa5i0wzipxqvkg6xpkjca0vvn8";
sha256 = "1afabh3g3gwj0ad53fs62waks815xcckf7pkci76l6vrghffcg8v";
type = "gem";
};
version = "2.3.0";
version = "2.3.1";
};
fuzzy_match = {
groups = ["default"];
12 changes: 6 additions & 6 deletions pkgs/development/mobile/cocoapods/gemset.nix
Original file line number Diff line number Diff line change
@@ -40,21 +40,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hbz1i513prx3nk507h3jyfza71x9xa23921mm1qyq5874myiwi9";
sha256 = "0c0xh7wh8l34wqiiwwhdakm6zin8xd5svgh63c6pb2pd1d4phhyv";
type = "gem";
};
version = "1.7.2";
version = "1.7.3";
};
cocoapods-core = {
dependencies = ["activesupport" "fuzzy_match" "nap"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "051pfrr1y1a8mky1nzlgql6nvhq4lwpg689rn45gb6lii1vn3yr4";
sha256 = "0p76z708fbb61x0m585iaf912f0s3qw0a1mryhpqa2wyrjrlmg31";
type = "gem";
};
version = "1.7.2";
version = "1.7.3";
};
cocoapods-deintegrate = {
groups = ["default"];
@@ -151,10 +151,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b9kzw8pr7bg67fqvv7x6xdknyfa5i0wzipxqvkg6xpkjca0vvn8";
sha256 = "1afabh3g3gwj0ad53fs62waks815xcckf7pkci76l6vrghffcg8v";
type = "gem";
};
version = "2.3.0";
version = "2.3.1";
};
fuzzy_match = {
source = {
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/dropbox/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

buildPythonPackage rec {
pname = "dropbox";
version = "9.3.0";
version = "9.4.0";

src = fetchPypi {
inherit pname version;
sha256 = "1ckpbksdby70d70m58b904h8y8v7m82h12n3q3qk58r4yrqwvld5";
sha256 = "0qid094qna6bl4zpd08f6snvipwjls1yadacvmwri11djgp0wvj3";
};

# Set DROPBOX_TOKEN environment variable to a valid token.
10 changes: 9 additions & 1 deletion pkgs/development/python-modules/pytest-mock/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, setuptools_scm }:
{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, pytest, mock, setuptools_scm }:

buildPythonPackage rec {
pname = "pytest-mock";
@@ -12,6 +12,14 @@ buildPythonPackage rec {
propagatedBuildInputs = lib.optional (!isPy3k) mock;
nativeBuildInputs = [ setuptools_scm pytest ];

patches = [
# Fix tests for pytest 4.6. Remove with the next release
(fetchpatch {
url = "https://github.com/pytest-dev/pytest-mock/commit/189cc599d3bfbe91a17c93211c04237b6c5849b1.patch";
sha256 = "13nk75ldab3j8nfzyd9w4cgfk2fxq4if1aqkqy82ar7y7qh07a7m";
})
];

checkPhase = ''
py.test
'';
12 changes: 6 additions & 6 deletions pkgs/development/tools/rust/cargo-make/default.nix
Original file line number Diff line number Diff line change
@@ -2,19 +2,19 @@

rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.20.0";
version = "0.21.0";

src =
let
source = fetchFromGitHub {
owner = "sagiegurari";
repo = pname;
rev = version;
sha256 = "0hf8g91iv4c856whaaqrv5s8z56gi3086pva6vdwmn75gwxkw7zk";
sha256 = "02hxf0mbk4nj9ja1z70k8fskh1kl3pixwy7gx0si5fbp9rmn04wk";
};
cargo-lock = fetchurl {
url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/8b4ca42376199d4e4781473b4112ef8f18bbd1cc/cargo-make-Cargo.lock";
sha256 = "1zffq7r1cnzdqw4d3vdvlwj56pfak9gj14ibn1g0j7lncwxw2dgs";
url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/b6017fd825b52987ac7c3b65620917e5d567312b/cargo-make-Cargo.lock";
sha256 = "15ajxza58bbviwjxl98c0z89w4430902j0z46b594nbm02kv2ad9";
};
in
runCommand "cargo-make-src" {} ''
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {

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

cargoSha256 = "1r2fiwcjf739rkprrwidgsd9i5pjgk723ipazmlccz2jpwbrk7zr";
cargoSha256 = "1fsfjavad1cbq1xvck2j5vyppxck606cpmqrwbs4fjvdmlbgx3gp";

# Some tests fail because they need network access.
# However, Travis ensures a proper build.
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {

meta = with stdenv.lib; {
description = "A Rust task runner and build tool";
homepage = https://github.com/sagiegurari/cargo-make;
homepage = "https://github.com/sagiegurari/cargo-make";
license = licenses.asl20;
maintainers = with maintainers; [ xrelkd ];
platforms = platforms.all;
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.131";
version = "4.14.132";

# 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 = "1xcg7ij3r6271qmcymaxprqa8qvdddkh5f8m6gza3agl61641xhr";
sha256 = "0c7k5yl2h929kvbzqij0p56myp9v14im4s72wky5d9idfadg71ns";
};
} // (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.56";
version = "4.19.57";

# 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 = "1pvbjsy2bd76mmxxv6bf8kh7g6ixlrbj92cm5qq6yjdr2lr989kk";
sha256 = "11rz1pfphc4zkn3fbfavn1764g3ymp4b1bfnr7b630w8smcmfz1j";
};
} // (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.15";
version = "5.1.16";

# 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 = "168kvin7s7f1rxfy187bw4dfzhm1dr2ypfs4gkrskkl04rq2i8g8";
sha256 = "0gms4zkx97njzk1czsnih6jj9f6knismixxndn1h11vq7sz5agla";
};
} // (args.argsOverride or {}))
4 changes: 4 additions & 0 deletions pkgs/os-specific/linux/nvidia-x11/settings.nix
Original file line number Diff line number Diff line change
@@ -24,6 +24,10 @@ let
cd src/libXNVCtrl
'';

makeFlags = [
"OUTPUTDIR=." # src/libXNVCtrl
];

installPhase = ''
mkdir -p $out/lib
mkdir -p $out/include/NVCtrl
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/pcm/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub }:

stdenv.mkDerivation rec {
version = "201710";
version = "201902";
name = "pcm-${version}";

src = fetchFromGitHub {
owner = "opcm";
repo = "pcm";
rev = "${version}";
sha256 = "02rq8739zwwbfrhagvcgf6qpmnswxl9b0qsld26rg6zp91v2npbj";
sha256 = "15kh5ry2w1zj2mbg98hlayw8g53jy79q2ixj2wm48g8vagamv77z";
};

installPhase = ''