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: a1f672dcfd4a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 39372fa0a9d1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 6, 2020

  1. rsyslog: add nixos tests to passthru.tests 

    ofborg does not build them yet, but at least nixpkgs-update does.
nix-community/nixpkgs-update#118
Note this test passes and would not have detected
#79304
    @FRidh
    FRidh committed Feb 6, 2020
    Copy the full SHA
    13b0a6e View commit details

Commits on Feb 7, 2020

  1. Merge pull request #79390 from FRidh/rsyslog 

    rsyslog: add nixos tests to passthru.tests
    @worldofpeace
    worldofpeace authored Feb 7, 2020
    Copy the full SHA
    39372fa View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 pkgs/tools/system/rsyslog/default.nix
5 changes: 5 additions & 0 deletions pkgs/tools/system/rsyslog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
, libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null, mongoc ? null
, libmaxminddb ? null
, nixosTests ? null
}:

with stdenv.lib;
@@ -103,6 +104,10 @@ stdenv.mkDerivation rec {
(mkFlag true "generate-man-pages")
];

passthru.tests = {
nixos-rsyslogd = nixosTests.rsyslogd;
};

meta = {
homepage = https://www.rsyslog.com/;
description = "Enhanced syslog implementation";