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: f51aa113f9ac
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: 1343f339b210
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on Nov 25, 2019

  1. solr: 8.2.0 -> 8.3.0 

    (cherry picked from commit 84bf78f)
    @r-ryantm @aanderse
    r-ryantm authored and aanderse committed Nov 25, 2019
    Copy the full SHA
    8ae889d View commit details

Commits on Nov 27, 2019

  1. chefdk: fix build (#74315) 

    (cherry picked from commit 30e7d12e1c9fb2770248abeaa721381360d27906)
    @etu @c0bw3b
    etu authored and c0bw3b committed Nov 27, 2019
    Copy the full SHA
    88a0667 View commit details

  2. Merge pull request #74194 from aanderse/solr-CVE 

    solr: 8.2.0 -> 8.3.0
    @globin
    globin authored Nov 27, 2019
    Copy the full SHA
    3e2db1f View commit details

  3. wireguard-tools: 0.0.20191012 -> 0.0.20191127 

    (cherry picked from commit bdcc0f4)
    @d-xo @Ma27
    d-xo authored and Ma27 committed Nov 27, 2019
    Copy the full SHA
    1343f33 View commit details
Showing with 5 additions and 5 deletions.
  1. +1 −1 pkgs/development/tools/chefdk/default.nix
  2. +2 −2 pkgs/servers/search/solr/8.x.nix
  3. +2 −2 pkgs/tools/networking/wireguard-tools/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/tools/chefdk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib, bundlerEnv, bundlerUpdateScript, ruby_2_4, perl, autoconf }:

bundlerEnv {
pname = "chef-dk";
name = "chef-dk-2.4.17";

ruby = ruby_2_4;
gemdir = ./.;
4 changes: 2 additions & 2 deletions pkgs/servers/search/solr/8.x.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "solr";
version = "8.2.0";
version = "8.3.0";

src = fetchurl {
url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
sha256 = "0j9lydxlng785h2n1b8avinrkqdpbj5qn4rk897p2pbf4fdv795z";
sha256 = "11qkipmj8qq4gw5lwnx1j8dr2lq8d5h1v1fbdyppw8l6a68j160s";
};

nativeBuildInputs = [ makeWrapper ];
4 changes: 2 additions & 2 deletions pkgs/tools/networking/wireguard-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,11 +13,11 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "wireguard-tools";
version = "0.0.20191012";
version = "0.0.20191127";

src = fetchzip {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "0nwcx7m5cpp4h1bclswiqq1jzj08xzpxmq5s4rcfqmrp59cmwgrs";
sha256 = "1n1x5858c32p0a13rrhn9a491174k5z4wd0gsy8qn546k1a8qj99";
};

sourceRoot = "source/src/tools";