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: 2d55f9c01a20
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: 74946536fe44
Choose a head ref

Commits on Apr 14, 2020

  1. blugon: 1.12.0 -> 1.12.1

    r-ryantm committed Apr 14, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    Copy the full SHA
    8f59b98 View commit details

Commits on Apr 15, 2020

  1. notejot: 1.6.0 -> 1.6.3

    r-ryantm committed Apr 15, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    Copy the full SHA
    ff820a1 View commit details
  2. otfcc: 0.9.6 -> 0.10.4

    r-ryantm committed Apr 15, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    Copy the full SHA
    913520a View commit details
  3. smarty3: 3.1.34 -> 3.1.35

    r-ryantm committed Apr 15, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    Copy the full SHA
    33da4f7 View commit details
  4. Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    Copy the full SHA
    b8a83a2 View commit details
  5. bibclean: 3.03 -> 3.04

    r-ryantm committed Apr 15, 2020
    Copy the full SHA
    cf1c924 View commit details
  6. Copy the full SHA
    dd3cc04 View commit details
  7. chirp: 20200213 -> 20200409

    r-ryantm committed Apr 15, 2020
    Copy the full SHA
    c446ce3 View commit details
  8. cfdg: 3.2_2 -> 3.3

    r-ryantm committed Apr 15, 2020
    Copy the full SHA
    8e00de9 View commit details
  9. Copy the full SHA
    05be03f View commit details

Commits on Apr 16, 2020

  1. Copy the full SHA
    1b95c71 View commit details
  2. eksctl: 0.16.0 -> 0.17.0

    xrelkd committed Apr 16, 2020
    Copy the full SHA
    5905597 View commit details
  3. Merge pull request #85310 from r-ryantm/auto-update/cfdg

    cfdg: 3.2_2 -> 3.3
    nh2 authored Apr 16, 2020
    Copy the full SHA
    4c48a24 View commit details
  4. Merge pull request #85309 from r-ryantm/auto-update/chirp-daily

    chirp: 20200213 -> 20200409
    nh2 authored Apr 16, 2020
    Copy the full SHA
    fc10692 View commit details
  5. Merge pull request #85297 from r-ryantm/auto-update/bibclean

    bibclean: 3.03 -> 3.04
    nh2 authored Apr 16, 2020
    Copy the full SHA
    4774ac3 View commit details
  6. Merge pull request #85292 from r-ryantm/auto-update/acpica-tools

    acpica-tools: 20200110 -> 20200326
    nh2 authored Apr 16, 2020
    Copy the full SHA
    9aaa515 View commit details
  7. Merge pull request #85283 from r-ryantm/auto-update/smarty3

    smarty3: 3.1.34 -> 3.1.35
    nh2 authored Apr 16, 2020
    Copy the full SHA
    7d39eea View commit details
  8. Merge pull request #85344 from xrelkd/update/eksctl

    eksctl: 0.16.0 -> 0.17.0
    marsam authored Apr 16, 2020
    Copy the full SHA
    23b6677 View commit details
  9. Merge pull request #85335 from zowoq/podman

    podman: 1.8.2 -> 1.9.0
    marsam authored Apr 16, 2020
    Copy the full SHA
    2da9490 View commit details
  10. Merge pull request #85302 from das-g/chromedriver-81.0.4044

    chromedriver: 80.0.3987.16 -> 81.0.4044.69
    marsam authored Apr 16, 2020
    Copy the full SHA
    50db521 View commit details
  11. Merge pull request #85273 from r-ryantm/auto-update/otfcc

    otfcc: 0.9.6 -> 0.10.4
    nh2 authored Apr 16, 2020
    Copy the full SHA
    ae06d93 View commit details
  12. Merge pull request #85261 from r-ryantm/auto-update/notejot

    notejot: 1.6.0 -> 1.6.3
    nh2 authored Apr 16, 2020
    Copy the full SHA
    33496aa View commit details
  13. Merge pull request #85196 from r-ryantm/auto-update/blugon

    blugon: 1.12.0 -> 1.12.1
    nh2 authored Apr 16, 2020
    Copy the full SHA
    7494653 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/blugon/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "blugon";
version = "1.12.0";
version = "1.12.1";

src = fetchFromGitHub {
owner = "jumper149";
repo = pname;
rev = version;
sha256 = "0vdhq8v011awhpkccbcmigj9c46widyzh0m5knafapanai3kv7ii";
sha256 = "1i67v8jxvavgax3dwvns200iwwdcvgki04liq0x64q52lg0vrh7m";
};

buildInputs = [ python3 libX11 libXrandr ];
4 changes: 2 additions & 2 deletions pkgs/applications/misc/notejot/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
pname = "notejot";
version = "1.6.0";
version = "1.6.3";

src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
sha256 = "1b65m9gvq8ziqqgnw3vgjpjb1qw7bww40ngd3gardsjg9lcwpxaf";
sha256 = "170dzgd6cnf2k3hfifjysmdggpskx6v1pjmblqgbwaj2d3snf3h8";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/applications/radio/chirp/default.nix
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@
}:
python2.pkgs.buildPythonApplication rec {
pname = "chirp-daily";
version = "20200213";
version = "20200409";

src = fetchurl {
url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz";
sha256 = "189kg3425wggib1cggcj49bk01pq3j4b8mks7najpp1rjsl5f2i1";
sha256 = "16zhwg2xmp5kpqx5isavwwkfq1212zgfj8gbp453ngjcrvp3m4lq";
};

propagatedBuildInputs = with python2.pkgs; [
24 changes: 16 additions & 8 deletions pkgs/applications/virtualization/podman/default.nix
Original file line number Diff line number Diff line change
@@ -1,24 +1,32 @@
{ stdenv, fetchFromGitHub, pkgconfig, installShellFiles
, buildGoPackage, gpgme, lvm2, btrfs-progs, libseccomp, systemd
{ stdenv
, fetchFromGitHub
, pkg-config
, installShellFiles
, buildGoPackage
, gpgme
, lvm2
, btrfs-progs
, libseccomp
, systemd
, go-md2man
}:

buildGoPackage rec {
pname = "podman";
version = "1.8.2";
version = "1.9.0";

src = fetchFromGitHub {
owner = "containers";
repo = "libpod";
rev = "v${version}";
sha256 = "1nxlkqz1ffa3l2yf4rmsxj788dx6xdp8pbi55m9jc9k1vqwc9hxs";
owner = "containers";
repo = "libpod";
rev = "v${version}";
sha256 = "19y48lpf7pvw5f5pzpknn92rq9xwbrpvi8mj7mc4dby6skqadrk4";
};

goPackagePath = "github.com/containers/libpod";

outputs = [ "bin" "out" "man" ];

nativeBuildInputs = [ pkgconfig go-md2man installShellFiles ];
nativeBuildInputs = [ pkg-config go-md2man installShellFiles ];

buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs libseccomp gpgme lvm2 systemd ];

4 changes: 2 additions & 2 deletions pkgs/development/libraries/smarty3/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
pname = "smarty3";
version = "3.1.34";
version = "3.1.35";

src = fetchFromGitHub {
owner = "smarty-php";
repo = "smarty";
rev = "v${version}";
sha256 = "0a44p71aqyifm7qkp892aczb0bn6a9fv4657dsscxszvdm25a92x";
sha256 = "05prjhlsmjmbjpks3bsx4ifz5izshsabys20c56jgibgnjsflm6k";
};

installPhase = ''
6 changes: 3 additions & 3 deletions pkgs/development/tools/selenium/chromedriver/default.nix
Original file line number Diff line number Diff line change
@@ -6,12 +6,12 @@ let
allSpecs = {
x86_64-linux = {
system = "linux64";
sha256 = "0cx6x5akmawyzm5dmd3xvj9a2vg4dnai1qs1v9p4acw9hai559c8";
sha256 = "1mqsangjindfqgvjxgmpgfrcd8a2lqmwl587l0ip0p5wwz8yq5wi";
};

x86_64-darwin = {
system = "mac64";
sha256 = "1nh7h2wpljpblwqr0km7nzg3ky5xw6cxqmgdmgvw6qia8bryw1lj";
sha256 = "18ydf2bk5aiin3yffb9z8215idz65nkhgxq0mmlvwb8gwsdvnwi1";
};
};

@@ -28,7 +28,7 @@ let
in
stdenv.mkDerivation rec {
pname = "chromedriver";
version = "80.0.3987.16";
version = "81.0.4044.69";

src = fetchurl {
url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";
4 changes: 3 additions & 1 deletion pkgs/servers/nextcloud/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, nixosTests }:

let
generic = { version, sha256, insecure ? false }: stdenv.mkDerivation rec {
@@ -10,6 +10,8 @@ let
inherit sha256;
};

passthru.tests = nixosTests.nextcloud;

installPhase = ''
mkdir -p $out/
cp -R . $out/
6 changes: 3 additions & 3 deletions pkgs/tools/admin/eksctl/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule rec {
pname = "eksctl";
version = "0.16.0";
version = "0.17.0";

src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
sha256 = "067q2cj4iwhiijv6nd9crjfncn67829f4d2ls07lwdcsvgi1cyfi";
sha256 = "0ck096qfj4wp166bymvync8qyb0q2az86hckjk3hrzqdj8vwhrza";
};

modSha256 = "187jv78asav97cbvn7336ycflqa0c2alvkhvlyv2mp5f3crygagy";
modSha256 = "024fqknv6f1zzcpxfl3c12d7ya7ynsyy7hf7zsnmpsnrksvbkfvc";

subPackages = [ "cmd/eksctl" ];

4 changes: 2 additions & 2 deletions pkgs/tools/graphics/cfdg/default.nix
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

stdenv.mkDerivation rec {
pname = "cfdg";
version = "3.2_2";
version = "3.3";
src = fetchFromGitHub {
owner = "MtnViewJohn";
repo = "context-free";
rev = "Version${version}";
sha256 = "14v1gya7h0p9dj16hw87wpmjfddmkz537w3kjvaribgxxp0gzyz5";
sha256 = "13m8npccacmgxbs4il45zw53dskjh53ngv2nxahwqw8shjrws4mh";
};

buildInputs = [ libpng bison flex ffmpeg icu ];
4 changes: 2 additions & 2 deletions pkgs/tools/misc/otfcc/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "otfcc";
version = "0.9.6";
version = "0.10.4";

src = fetchFromGitHub {
owner = "caryll";
repo = "otfcc";
rev = "v${version}";
sha256 = "1rnjfqqyc6d9nhlh8if9k37wk94mcwz4wf3k239v6idg48nrk10b";
sha256 = "1nrkzpqklfpqsccji4ans40rj88l80cv7dpxwx4g577xrvk13a0f";
};

nativeBuildInputs = [ premake5 ];
4 changes: 2 additions & 2 deletions pkgs/tools/system/acpica-tools/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "acpica-tools";
version = "20200110";
version = "20200326";

src = fetchurl {
url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
sha256 = "1cb6aa6acrixmdzvj9vv4qs9lmlsbkd27pjlz14i1kq1x3xn0gwx";
sha256 = "1zr2sziiy5jvwgmxpgy2imzsmmb6hlncfd816i7qxrixg2ag7ycr";
};

NIX_CFLAGS_COMPILE = "-O3";
4 changes: 2 additions & 2 deletions pkgs/tools/typesetting/bibclean/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "bibclean";
version = "3.03";
version = "3.04";

src = fetchurl {
url = "http://ftp.math.utah.edu/pub/bibclean/bibclean-${version}.tar.xz";
sha256 = "06ic9zix8gh1wz7hd1cnlxxyrp7sqs67a7xnv08r71b5ikri35a3";
sha256 = "0n5jb6w86y91q5lkcc9sb1kh4c2bk3q2va24gfr0n6v1jzyqp9jg";
};

postPatch = ''