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

Commits on Apr 12, 2020

  1. earlyoom: 1.5 -> 1.6

    @r-ryantm @marsam
    r-ryantm authored and marsam committed Apr 12, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    prusnak Pavol Rusnak
    GPG key ID: 91F3B339B9A02A3D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1c0b645 View commit details

  2. Merge pull request #85059 from r-ryantm/auto-update/earlyoom 

    earlyoom: 1.5 -> 1.6
    @marsam
    marsam authored Apr 12, 2020
    Copy the full SHA
    4d03f4b View commit details
Showing with 16 additions and 11 deletions.
  1. +16 −11 pkgs/os-specific/linux/earlyoom/default.nix
27 changes: 16 additions & 11 deletions pkgs/os-specific/linux/earlyoom/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
{ lib, stdenv, fetchFromGitHub }:
{ stdenv, fetchFromGitHub, pandoc, installShellFiles, withManpage ? false }:

stdenv.mkDerivation rec {
name = "earlyoom-${VERSION}";
# This environment variable is read by make to set the build version.
VERSION = "1.5";
pname = "earlyoom";
version = "1.6";

src = fetchFromGitHub {
owner = "rfjakob";
repo = "earlyoom";
rev = "v${VERSION}";
sha256 = "1wcw2lfd9ajachbrjqywkzj9x6zv32gij2r6yap26x1wdd5x7i93";
rev = "v${version}";
sha256 = "0g2bjsvnqq5h4g1k3a0x6ixb334wpzbm2gafl78b6ic6j45smwcs";
};

nativeBuildInputs = stdenv.lib.optionals withManpage [ pandoc installShellFiles ];

makeFlags = [ "VERSION=${version}" ];

installPhase = ''
install -D earlyoom $out/bin/earlyoom
'' + stdenv.lib.optionalString withManpage ''
installManPage earlyoom.1
'';

meta = {
meta = with stdenv.lib; {
description = "Early OOM Daemon for Linux";
homepage = "https://github.com/rfjakob/earlyoom";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ];
homepage = "https://github.com/rfjakob/earlyoom";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [];
};
}