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

Commits on Apr 3, 2020

  1. conmon: 2.0.14 -> 2.0.15 

    Signed-off-by: Sascha Grunert <sgrunert@suse.com>
    @saschagrunert
    saschagrunert committed Apr 3, 2020
    Copy the full SHA
    109362d View commit details

  2. Merge pull request #84168 from saschagrunert/conmon 

    conmon: 2.0.14 -> 2.0.15
    @marsam
    marsam authored Apr 3, 2020
    Copy the full SHA
    2d2fc9a View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/virtualization/conmon/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/conmon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@

stdenv.mkDerivation rec {
pname = "conmon";
version = "2.0.14";
version = "2.0.15";

src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
sha256 = "1h5mxs8wrsm1q48fmd7slpa0j6g6kjbm1mcizyhk7xz1xrbnicc1";
sha256 = "1fshcmnfqzbagzcrh5nxw7pi0dd60xpq47a2lzfghklqhl1h0b5i";
};

nativeBuildInputs = [ pkg-config ];