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: ef450efb9df5
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: c1328a1779a0
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 21, 2018

  1. nixos/tests/atd: wait for atd to start 

    The test failed non-deterministically when an at command was
issued before the atd daemon was running.

(cherry picked from commit 8ffd65b)
Backport to 18.09
    @xeji @srhb
    xeji authored and srhb committed Sep 21, 2018
    Copy the full SHA
    711ff4b View commit details

  2. bat: install man page (#47099) 

    (cherry picked from commit ba33eac)
    @marsam @xeji
    marsam authored and xeji committed Sep 21, 2018
    Copy the full SHA
    c1328a1 View commit details
Showing with 5 additions and 0 deletions.
  1. +1 −0 nixos/tests/atd.nix
  2. +4 −0 pkgs/tools/misc/bat/default.nix
1 change: 1 addition & 0 deletions nixos/tests/atd.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ import ./make-test.nix ({ pkgs, ... }:
testScript = ''
startAll;
$machine->waitForUnit('atd.service'); # wait for atd to start
$machine->fail("test -f ~root/at-1");
$machine->fail("test -f ~alice/at-1");
4 changes: 4 additions & 0 deletions pkgs/tools/misc/bat/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,6 +20,10 @@ rustPlatform.buildRustPackage rec {
darwin.apple_sdk.frameworks.Security
];

postInstall = ''
install -m 444 -Dt $out/share/man/man1 doc/bat.1
'';

meta = with stdenv.lib; {
description = "A cat(1) clone with syntax highlighting and Git integration";
homepage = https://github.com/sharkdp/bat;