Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e98a2d752ca5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 52c8d46286f5
Choose a head ref
  • 5 commits
  • 3 files changed
  • 3 contributors

Commits on Oct 23, 2019

  1. nodejs-10_x: 10.16.3 -> 10.17.0 

    Release notes: https://nodejs.org/en/blog/release/v10.17.0/
    @marsam
    marsam committed Oct 23, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    7785f49 View commit details

  2. riemann: 0.3.3 -> 0.3.4 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/riemann/versions
    @r-ryantm
    r-ryantm committed Oct 23, 2019
    Copy the full SHA
    df0aa12 View commit details

Commits on Oct 24, 2019

  1. Merge pull request #71796 from marsam/update-nodejs-10_x 

    nodejs-10_x: 10.16.3 -> 10.17.0
    @marsam
    marsam authored Oct 24, 2019
    Copy the full SHA
    eee978f View commit details

  2. Merge pull request #71869 from r-ryantm/auto-update/riemann 

    riemann: 0.3.3 -> 0.3.4
    @marsam
    marsam authored Oct 24, 2019
    Copy the full SHA
    563c526 View commit details

  3. conftest: Remove sumdb override now that #34866 is merged (#71479)

    @c00w @kalbasit
    c00w authored and kalbasit committed Oct 24, 2019
    Copy the full SHA
    52c8d46 View commit details
Showing with 4 additions and 13 deletions.
  1. +0 −9 pkgs/development/tools/conftest/default.nix
  2. +2 −2 pkgs/development/web/nodejs/v10.nix
  3. +2 −2 pkgs/servers/monitoring/riemann/default.nix
9 changes: 0 additions & 9 deletions pkgs/development/tools/conftest/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,15 +4,6 @@ buildGoModule rec {
pname = "conftest";
version = "0.14.0";

# Something subtle in the go sum db is causing every download to
# get a new sum (and thus breaking the hash). This disables the
# fetching of the sum from the go sum database.
modBuildPhase = ''
runHook preBuild
GONOSUMDB=* go mod download
runHook postBuild
'';

src = fetchFromGitHub {
owner = "instrumenta";
repo = "conftest";
4 changes: 2 additions & 2 deletions pkgs/development/web/nodejs/v10.nix
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,6 @@ let
in
buildNodejs {
inherit enableNpm;
version = "10.16.3";
sha256 = "1gbblbmvx7a0wkgp3fs2pf5c1hymdpnfc7zqp1slg5hmfhyi5wbv";
version = "10.17.0";
sha256 = "13n5cvb340ba7vwm8il7bjrmpz89h6cibhk9rc3kq9ymdgbnf9j1";
}
4 changes: 2 additions & 2 deletions pkgs/servers/monitoring/riemann/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "riemann";
version = "0.3.3";
version = "0.3.4";

src = fetchurl {
url = "https://github.com/riemann/riemann/releases/download/${version}/${pname}-${version}.tar.bz2";
sha256 = "11xcmmp5k78vr5ch42zwx9ym84y6kf81z9zwawqybvx7wmlbpdiq";
sha256 = "1c31higrsmpkvl956rrw1hpwjyvypgrjzl6vky0gn55zgvisasn4";
};

nativeBuildInputs = [ makeWrapper ];