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

Commits on Jan 16, 2020

  1. crun: 0.10.6 -> 0.11

    @zowoq
    zowoq committed Jan 16, 2020
    Copy the full SHA
    f64bcd6 View commit details

Commits on Jan 23, 2020

  1. Merge pull request #77483 from zowoq/crun 

    crun: 0.10.6 -> 0.11
    @peterhoeg
    peterhoeg authored Jan 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2cfb5f5 View commit details
Showing with 10 additions and 2 deletions.
  1. +10 −2 pkgs/applications/virtualization/crun/default.nix
12 changes: 10 additions & 2 deletions pkgs/applications/virtualization/crun/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
pname = "crun";
version = "0.10.6";
version = "0.11";

src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
sha256 = "0v1hrlpnln0c976fb0k2ig4jv11qbyzf95z0wy92fd8r8in16rc1";
sha256 = "0mn64hrgx4a7mhqjxn127i8yivhn1grp93wws1da1ffj4ap6ay76";
fetchSubmodules = true;
};

@@ -19,6 +19,14 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

preBuild = ''
cat > git-version.h <<EOF
#ifndef GIT_VERSION
# define GIT_VERSION "nixpkgs-${version}"
#endif
EOF
'';

# the tests require additional permissions
doCheck = false;