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: f57da8ef0a9c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2da253a7ded5
Choose a head ref
  • 4 commits
  • 5 files changed
  • 1 contributor

Commits on Apr 15, 2020

  1. iftop: add passthru.tests to reference VM-test

    @Ma27
    Ma27 committed Apr 15, 2020
    Copy the full SHA
    e3553f1 View commit details

  2. grocy: add passthru.tests to reference VM-test

    @Ma27
    Ma27 committed Apr 15, 2020
    Copy the full SHA
    37fe88e View commit details

  3. cargo-make: 0.30.4 -> 0.30.5 

    https://github.com/sagiegurari/cargo-make/releases/tag/0.30.5
    @Ma27
    Ma27 committed Apr 15, 2020
    Copy the full SHA
    b7c3c3f View commit details

  4. documize-community: add passthru.tests to reference VM-test

    @Ma27
    Ma27 committed Apr 15, 2020
    Copy the full SHA
    2da253a View commit details
74 changes: 62 additions & 12 deletions pkgs/development/tools/rust/cargo-make/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkgs/development/tools/rust/cargo-make/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.30.4";
version = "0.30.5";

src =
let
source = fetchFromGitHub {
owner = "sagiegurari";
repo = pname;
rev = version;
sha256 = "14sl7kcr1n3xb912vd3445pwf3v1kp74lgxlwqybnwiyh1dxihvg";
sha256 = "0p6rzkrwyfcrg4qrlb67rf0wb12kqldl1xg0rfnwc23y17fbwx49";
};
in
runCommand "source" {} ''
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];

cargoSha256 = "06i1z5jjqyadmvjgwxjlxcj2mmb0g83byibl3ap9qffahn0vhf7x";
cargoSha256 = "14gbs0ldkxxwav773r2851gyrd0h12dy3g0fcr2j3az4zq983ggd";

# Some tests fail because they need network access.
# However, Travis ensures a proper build.
4 changes: 3 additions & 1 deletion pkgs/servers/documize-community/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs }:
{ lib, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs, nixosTests }:

buildGoModule rec {
pname = "documize-community";
@@ -17,6 +17,8 @@ buildGoModule rec {

subPackages = [ "edition/community.go" ];

passthru.tests = { inherit (nixosTests) documize; };

postInstall = ''
# `buildGoModule` calls `go install` (without `go build` first), so
# `-o bin/documize` doesn't work.
4 changes: 3 additions & 1 deletion pkgs/servers/grocy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip }:
{ stdenv, fetchurl, unzip, nixosTests }:

stdenv.mkDerivation rec {
pname = "grocy";
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {

dontBuild = true;

passthru.tests = { inherit (nixosTests) grocy; };

installPhase = ''
mkdir -p $out/
cp -R . $out/
4 changes: 3 additions & 1 deletion pkgs/tools/networking/iftop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{stdenv, fetchurl, ncurses, libpcap, automake}:
{ stdenv, fetchurl, ncurses, libpcap, automake, nixosTests }:

stdenv.mkDerivation {
name = "iftop-1.0pre4";
@@ -18,6 +18,8 @@ stdenv.mkDerivation {

buildInputs = [ncurses libpcap];

passthru.tests = { inherit (nixosTests) iftop; };

meta = with stdenv.lib; {
description = "Display bandwidth usage on a network interface";
longDescription = ''