Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

crun: 0.10.6 -> 0.11 #77483

Merged
merged 1 commit into from Jan 23, 2020
Merged

crun: 0.10.6 -> 0.11 #77483

merged 1 commit into from Jan 23, 2020

Conversation

@zowoq
Copy link
Contributor

@zowoq zowoq commented Jan 11, 2020

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@zowoq zowoq force-pushed the zowoq:crun branch 2 times, most recently from 01b8541 to 5341233 Jan 11, 2020
Copy link
Contributor

@jonringer jonringer left a comment

diff LGTM
commit LGTM
executable shows usage

https://github.com/NixOS/nixpkgs/pull/77483
1 package built:
crun
@jonringer
Copy link
Contributor

@jonringer jonringer commented Jan 11, 2020

@GrahamcOfBorg build crun

Copy link
Member

@peterhoeg peterhoeg left a comment

NACK on the source change.

If we start building from the release tarball and therefore remove autoreconfHook it means that people cannot otherwise override the derivation in order to build from their own fork.

Not showing the version is of course sub-optimal but cosmetic - and entirely fixable so address that instead.

@zowoq zowoq closed this Jan 12, 2020
@zowoq zowoq deleted the zowoq:crun branch Jan 12, 2020
@jonringer
Copy link
Contributor

@jonringer jonringer commented Jan 12, 2020

the version could have been patched in, if you still feel like trying to update the package, please re-open :)

example

  sed -i '/#define VERSION/c\#define VERSION ${version}' config.h
@peterhoeg
Copy link
Member

@peterhoeg peterhoeg commented Jan 13, 2020

@zowoq, it would be fantastic if you could so the patching as proposed by @jonringer and update the package. We definitely want the latest and greatest! ;-)

@zowoq zowoq restored the zowoq:crun branch Jan 13, 2020
@zowoq zowoq reopened this Jan 13, 2020
@zowoq zowoq force-pushed the zowoq:crun branch from 5341233 to dad503e Jan 13, 2020
@zowoq
Copy link
Contributor Author

@zowoq zowoq commented Jan 13, 2020

Not using a shallow clone and adding git as a build dep lets the build set tag/version and commit itself.


src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
sha256 = "0v1hrlpnln0c976fb0k2ig4jv11qbyzf95z0wy92fd8r8in16rc1";
sha256 = "1ikx8752h488kpv9dcgirxnr560w60ic7v1w73aam54g32gdql3w";
deepClone = true;
fetchSubmodules = true;

This comment has been minimized.

@volth

volth Jan 14, 2020
Contributor

I got the error:

 hash mismatch in fixed-output derivation '/nix/store/5m593px4liv6a3hzryi0wxmzq5mh0acf-source':
   wanted: sha256:1ikx8752h488kpv9dcgirxnr560w60ic7v1w73aam54g32gdql3w
   got:    sha256:1yw1g1w4hg9kh6s0lgyi1i9pxaqq4wxsmjnjdcvsgw2nxbj68nnq

deepClone always had some reproducibility problems

.git content depends on git's version and sometimes on the moon phase.

@zowoq
Copy link
Contributor Author

@zowoq zowoq commented Jan 15, 2020

Starting with this version the .git dir is required when building from a checkout even if we don't care about setting the version and commit.

Patching the configure and makefile looks non-trivial and might be bit fragile for a pre-1.0.0 upstream.

@volth
Copy link
Contributor

@volth volth commented Jan 15, 2020

Patching the configure and makefile looks non-trivial and might be bit fragile for a pre-1.0.0 upstream.

A possible alternative (which is used in graalvm8 derivation) is to create a fake .git before the build, just git init; git add *; git commit -m message -a; git tag whatyouwant

@zowoq
Copy link
Contributor Author

@zowoq zowoq commented Jan 16, 2020

The build complains that .git is missing but if you create the file it would have generated if .git existed the build succeeds.

@zowoq zowoq force-pushed the zowoq:crun branch from dad503e to f64bcd6 Jan 16, 2020
@zowoq zowoq requested a review from peterhoeg Jan 22, 2020
@peterhoeg peterhoeg merged commit 2cfb5f5 into NixOS:master Jan 23, 2020
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
crun on aarch64-linux Success
Details
crun on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@peterhoeg
Copy link
Member

@peterhoeg peterhoeg commented Jan 23, 2020

Thanks @zowoq

@zowoq zowoq deleted the zowoq:crun branch Jan 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.