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: a65f338ccbd6
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: 414591344e46
Choose a head ref

Commits on Jan 6, 2020

  1. libmysofa: 0.9 -> 0.9.1

    r-ryantm committed Jan 6, 2020
    Copy the full SHA
    e8e7fb5 View commit details

Commits on Jan 15, 2020

  1. dar: 2.6.6 -> 2.6.7

    r-ryantm committed Jan 15, 2020
    Copy the full SHA
    51f055f View commit details
  2. doodle: 0.7.0 -> 0.7.1

    r-ryantm committed Jan 15, 2020
    Copy the full SHA
    1ed242a View commit details

Commits on Jan 17, 2020

  1. hpx: 1.3.0 -> 1.4.0

    r-ryantm committed Jan 17, 2020
    Copy the full SHA
    ad115de View commit details
  2. rebar: 2.5.1 -> 2.6.4

    r-ryantm committed Jan 17, 2020
    Copy the full SHA
    a98253f View commit details
  3. scream-receivers: 3.3 -> 3.4

    r-ryantm committed Jan 17, 2020
    Copy the full SHA
    b103b00 View commit details

Commits on Jan 20, 2020

  1. Copy the full SHA
    363840f View commit details
  2. nfpm: 1.1.8 -> 1.1.10

    marsam committed Jan 20, 2020
    Copy the full SHA
    4a5c337 View commit details
  3. acme-sh: 2.8.3 -> 2.8.5

    r-ryantm committed Jan 20, 2020
    Copy the full SHA
    02fad0d View commit details
  4. asymptote: 2.61 -> 2.62

    r-ryantm committed Jan 20, 2020
    Copy the full SHA
    68ee1de View commit details
  5. graylog: 3.1.3 -> 3.1.4

    r-ryantm committed Jan 20, 2020
    Copy the full SHA
    0928c40 View commit details
  6. mirrors.nix: Use HTTPS in maven mirrors

    Since 2020-01-15, the maven central repository does no longer support HTTP.
    See https://blog.sonatype.com/central-repository-moving-to-https for details.
    MazeChaZer committed Jan 20, 2020
    Copy the full SHA
    6187072 View commit details
  7. Merge pull request #78069 from r-ryantm/auto-update/asymptote

    asymptote: 2.61 -> 2.62
    peti authored Jan 20, 2020
    Copy the full SHA
    6cc43ee View commit details
  8. Copy the full SHA
    6b023dc View commit details
  9. Copy the full SHA
    411f068 View commit details
  10. Merge pull request #78087 from MazeChaZer/maven-mirrors-https

    mirrors.nix: Use HTTPS in maven mirrors
    mmahut authored Jan 20, 2020
    Copy the full SHA
    c82e1c6 View commit details
  11. Copy the full SHA
    489f823 View commit details
  12. Merge pull request #77900 from r-ryantm/auto-update/scream-receivers

    scream-receivers: 3.3 -> 3.4
    marsam authored Jan 20, 2020
    Copy the full SHA
    29fd96f View commit details
  13. focuswriter: 1.7.3 -> 1.7.4

    r-ryantm authored and bennofs committed Jan 20, 2020
    Copy the full SHA
    1d1a8fe View commit details
  14. Merge pull request #77899 from r-ryantm/auto-update/rebar

    rebar: 2.5.1 -> 2.6.4
    marsam authored Jan 20, 2020
    Copy the full SHA
    5f3a55c View commit details
  15. Merge pull request #78061 from r-ryantm/auto-update/atlassian-cli

    atlassian-cli: 9.0.0 -> 9.1.0
    marsam authored Jan 20, 2020
    Copy the full SHA
    c7b71bd View commit details
  16. Merge pull request #78063 from marsam/update-nfpm

    nfpm: 1.1.8 -> 1.1.10
    marsam authored Jan 20, 2020
    Copy the full SHA
    c0c1b9d View commit details
  17. Merge pull request #78068 from r-ryantm/auto-update/acme.sh

    acme-sh: 2.8.3 -> 2.8.5
    marsam authored Jan 20, 2020
    Copy the full SHA
    949c5f8 View commit details
  18. Merge pull request #77751 from r-ryantm/auto-update/doodle

    doodle: 0.7.0 -> 0.7.1
    marsam authored Jan 20, 2020
    Copy the full SHA
    8f71973 View commit details
  19. Merge pull request #77875 from r-ryantm/auto-update/hpx

    hpx: 1.3.0 -> 1.4.0
    marsam authored Jan 20, 2020
    Copy the full SHA
    e1ea264 View commit details
  20. Copy the full SHA
    70afd4e View commit details
  21. Merge pull request #77735 from r-ryantm/auto-update/dar

    dar: 2.6.6 -> 2.6.7
    marsam authored Jan 20, 2020
    Copy the full SHA
    49f0e33 View commit details
  22. linux: 5.5-rc6 -> 5.5-rc7

    NeQuissimus committed Jan 20, 2020
    Copy the full SHA
    d9e2bcb View commit details
  23. Merge pull request #78086 from r-ryantm/auto-update/graylog

    graylog: 3.1.3 -> 3.1.4
    Ma27 authored Jan 20, 2020
    Copy the full SHA
    d06b5da View commit details
  24. Merge pull request #77150 from r-ryantm/auto-update/libmysofa

    libmysofa: 0.9 -> 0.9.1
    marsam authored Jan 20, 2020
    Copy the full SHA
    4145913 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/editors/focuswriter/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

mkDerivation rec {
pname = "focuswriter";
version = "1.7.3";
version = "1.7.4";

src = fetchurl {
url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
sha256 = "155wf7z1g2yx6fb41w29kcb0m2rhnk9ci5yw882yy86s4x20b1jq";
sha256 = "1fli85p9d58gsg2kwmncqdcw1nmx062kddbrhr50mnsn04dc4j3g";
};

nativeBuildInputs = [ pkgconfig qmake qttools ];
4 changes: 2 additions & 2 deletions pkgs/applications/office/atlassian-cli/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "atlassian-cli";
version = "9.0.0";
version = "9.1.0";

src = fetchzip {
url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip";
sha256 = "1z8723krq65fcy5aapgiz216vrpw2nw8fbn1h3a4zpis7kw8qp0f";
sha256 = "06431nmz2k1d7vdpnyr88j777sfaa0vrfvxbr9zikn65176mkw7k";
extraPostFetch = "chmod go-w $out";
};

4 changes: 2 additions & 2 deletions pkgs/applications/search/doodle/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, libextractor, gettext }:

stdenv.mkDerivation rec {
name = "doodle-0.7.0";
name = "doodle-0.7.1";

buildInputs = [ libextractor gettext ];

src = fetchurl {
url = "https://grothoff.org/christian/doodle/download/${name}.tar.gz";
sha256 = "0ayx5q7chzll9sv3miq35xl36r629cvgdzphf379kxzlzhjldy3j";
sha256 = "086va4q8swiablv5x72yikrdh5swhy7kzmg5wlszi5a7vjya29xw";
};

meta = {
4 changes: 2 additions & 2 deletions pkgs/build-support/fetchurl/mirrors.nix
Original file line number Diff line number Diff line change
@@ -425,8 +425,8 @@

# Maven Central
maven = [
http://repo1.maven.org/maven2/
http://central.maven.org/maven2/
https://repo1.maven.org/maven2/
https://central.maven.org/maven2/
];

# Alsa Project
4 changes: 2 additions & 2 deletions pkgs/development/libraries/audio/libmysofa/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "libmysofa";
version = "0.9";
version = "0.9.1";

src = fetchFromGitHub {
owner = "hoene";
repo = "libmysofa";
rev = "v${version}";
sha256 = "14k8c31xh0v4r34h89ld440j9zri4plblmlhj5ddhdmzqmh4lr9f";
sha256 = "10pz9n99cl2j72m7bdj8xka5akyk0sjbysr7rlfdq0qfkiq5922v";
};

nativeBuildInputs = [ cmake ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/hpx/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "hpx";
version = "1.3.0";
version = "1.4.0";

src = fetchFromGitHub {
owner = "STEllAR-GROUP";
repo = "hpx";
rev = version;
sha256 = "0yzxb8520qh9rvzsa190yzx21jn3d8rl8ac5v01767ygd0413hfk";
sha256 = "1wkipk7240vqpy8and2r8n7wnqyl4dcn41cyla4zcns2jhbr23vb";
};

buildInputs = [ boost hwloc gperftools ];
4 changes: 4 additions & 0 deletions pkgs/development/ocaml-modules/janestreet/0.12.nix
Original file line number Diff line number Diff line change
@@ -398,6 +398,10 @@ rec {
hash = "1sw32lb0y501y971ij7287796lvfhs0nfgla895r74ymfks2rcjb";
meta.description = "OCaml bindings for RE2, Google's regular expression library";
propagatedBuildInputs = [ core_kernel ];
prePatch = ''
substituteInPlace src/re2_c/dune --replace 'CXX=g++' 'CXX=c++'
substituteInPlace src/dune --replace '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2))' '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2) (-x c++))'
'';
};

shell = janePackage {
4 changes: 2 additions & 2 deletions pkgs/development/tools/build-managers/rebar/default.nix
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@


let
version = "2.5.1";
version = "2.6.4";
in
stdenv.mkDerivation {
pname = "rebar";
inherit version;

src = fetchurl {
url = "https://github.com/rebar/rebar/archive/${version}.tar.gz";
sha256 = "1y9b0smw0g5q197xf4iklzmcf8ad6w52p6mwzpf7b0ib1nd89jw6";
sha256 = "01xxq1f1vrwca00pky2van26hi2hhr05ghfhy71v5cifzax4cwjp";
};

buildInputs = [ erlang ];
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:

let
version = "12.6.0";
version = "12.7.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
sha256 = "14wp9dyacbldfvykc68pa0mj59anf0zfadxsr9bqwyl795zsxh7g";
sha256 = "0vaaaw6hxmr55kgcn86rim9in96zmyv0zhl7asr4b7qknabsjp4m";
};

docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
sha256 = "1iln85xy4qkz7ps2vr4qlbvn4p1b8137a75r4s24bc7g6apzyyvs";
sha256 = "031fv7f15wiqq7209n2ab7n3qzjf7cjzvbp4pkz24bkc3lr3y773";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "08vxgv6m83wqxksy0vj7nx6bb55sxn9c7l0sdpg0nblps0n8fzxm";
sha256 = "0f08syk7v7w89pcdbzwgscsxl54gnms1qd4spjppnq4h5r959jp2";
};

patches = [ ./fix-shell-path.patch ];
4 changes: 2 additions & 2 deletions pkgs/games/stockfish/default.nix
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ let arch = if stdenv.isx86_64 then "x86-64" else
if stdenv.isi686 then "x86-32" else
"unknown";

version = "10";
version = "11";
in

stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {

src = fetchurl {
url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz";
sha256 = "1lrxqq8fw1wrw5b45r4s3ddd51yr85a2k8a9i1wjvyd6v9vm7761";
sha256 = "16di83s79gf9kzdhcal5y0q9d59544gd5xqf1k8bwrqvc36628l0";
};

postUnpack = "sourceRoot+=/src";
4 changes: 2 additions & 2 deletions pkgs/misc/scream-receivers/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "scream-receivers";
version = "3.3";
version = "3.4";

src = fetchFromGitHub {
owner = "duncanthrax";
repo = "scream";
rev = version;
sha256 = "1iqhs7m0fv3vfld7h288j5j0jc5xdihaghd0jd9qrk68mj2g6g9w";
sha256 = "1ig89bmzfrm57nd8lamzsdz5z81ks5vjvq3f0xhgm2dk2mrgjsj3";
};

buildInputs = [ alsaLib ] ++ lib.optional pulseSupport libpulseaudio;
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-testing.nix
Original file line number Diff line number Diff line change
@@ -3,15 +3,15 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.5-rc6";
version = "5.5-rc7";
extraMeta.branch = "5.5";

# modDirVersion needs to be x.y.z, will always add .0
modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg;

src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "0y4rsxynn0qprrsxy4v5vr4ihhavn43yqqp1qfrrxsfw15djncc2";
sha256 = "10fjk4bw73x5xpb4q83ngni7slw489wdxhdwmyrkfqqy5chgm290";
};

# Should the testing kernels ever be built on Hydra?
4 changes: 2 additions & 2 deletions pkgs/shells/zsh/zsh-you-should-use/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "zsh-you-should-use";
version = "1.6.0";
version = "1.7.0";

src = fetchFromGitHub {
owner = "MichaelAquilina";
repo = pname;
rev = version;
sha256 = "1xzq7xmmx4rg53pd69d0s9n561q4z35hlbb2sq2xd76gk3x6fars";
sha256 = "1gcxm08ragwrh242ahlq3bpfg5yma2cshwdlj8nrwnd4qwrsflgq";
};

dontBuild = true;
4 changes: 2 additions & 2 deletions pkgs/tools/admin/acme.sh/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools }:
stdenv.mkDerivation rec {
pname = "acme.sh";
version = "2.8.3";
version = "2.8.5";

src = fetchFromGitHub {
owner = "Neilpang";
repo = "acme.sh";
rev = version;
sha256 = "0j9wn61jd107fq9ww79399s7adql0vf897s0xavlvv6chq8a6ajj";
sha256 = "0yxhfdb0jz0wn10ka6c79qvcx07656vsaxmjls8qgcfgc472ymhs";
};

nativeBuildInputs = [ makeWrapper ];
4 changes: 2 additions & 2 deletions pkgs/tools/backup/dar/default.nix
Original file line number Diff line number Diff line change
@@ -3,12 +3,12 @@
with stdenv.lib;

stdenv.mkDerivation rec {
version = "2.6.6";
version = "2.6.7";
pname = "dar";

src = fetchurl {
url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
sha256 = "1pqdcb9dkjlf8wzpsnx4gcv9nhrm60glv4xadxnknnqlvzs6vips";
sha256 = "055kkxhg7sz3fbndsr4p2wp7aa2phq3pr0a9y7b1fkg52x7fbhr2";
};

buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]
4 changes: 2 additions & 2 deletions pkgs/tools/graphics/asymptote/default.nix
Original file line number Diff line number Diff line change
@@ -9,14 +9,14 @@
}:

stdenv.mkDerivation rec {
version = "2.61";
version = "2.62";
pname = "asymptote";

src = fetchFromGitHub {
owner = "vectorgraphics";
repo = pname;
rev = version;
sha256 = "0nblcxqzaxv1286zl2fjkivgp478l0nf3m0wnk78rd99lscjlw71";
sha256 = "1lb3a8r2gv0437viwy25s34g05x5v81gk0nxlgx7hzwv7b9zkv5s";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/tools/misc/graylog/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "graylog";
version = "3.1.3";
version = "3.1.4";

src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
sha256 = "0jwfq9q10nz6fy9ac2j4fcf0liz4vj0q7jmfhy9dsa3476zccwa8";
sha256 = "1z7jy82dk5l2yxmcb7y0jws4p1l367fxj69pfi10ajssj66vwjfw";
};

dontBuild = true;
6 changes: 3 additions & 3 deletions pkgs/tools/package-management/nfpm/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule rec {
pname = "nfpm";
version = "1.1.8";
version = "1.1.10";

src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "0yy75iagyrr96y7497hbbizrm59c757mshwicl1b7ni2sn3p63fh";
sha256 = "0qn9hybqnhyf1xb6n0m4qq2ac8h187i2pjkkik73qly1hmyq45j7";
};

modSha256 = "05hcn0k1zb4k4p3aaas7b276jw607cv290np9vmyqxb3khzv4vjg";
modSha256 = "037ihnvssgkzbg94yfw4lwqnhj02m187dfn1fm7i6yv13kf0gkpx";

buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];