diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-21 12:53:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-21 12:53:36 +0000 |
| commit | d6925182cdaf94225908a386d02eae8fd3e01123 (patch) | |
| tree | b94a6d55e7560da6e1edb0ca46bb5568904dbccd /nix | |
| parent | 5c6b5ef34905f40562b518799c35be8d06694e65 (diff) | |
| parent | 0599b2185768a5656e7f782fd040ec6b18cdb825 (diff) | |
| download | podman-d6925182cdaf94225908a386d02eae8fd3e01123.tar.gz podman-d6925182cdaf94225908a386d02eae8fd3e01123.tar.bz2 podman-d6925182cdaf94225908a386d02eae8fd3e01123.zip | |
Merge pull request #8526 from alvistack/master-linux-amd64
Update nix pin with `make nixpkgs`
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/default.nix | 4 | ||||
| -rw-r--r-- | nix/nixpkgs.json | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/nix/default.nix b/nix/default.nix index a1a8c5287..13b4585ea 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -38,10 +38,10 @@ let doCheck = false; enableParallelBuilding = true; outputs = [ "out" ]; - nativeBuildInputs = [ bash git go-md2man installShellFiles makeWrapper pkg-config which ]; + nativeBuildInputs = [ bash gitMinimal go-md2man installShellFiles makeWrapper pkg-config which ]; buildInputs = [ glibc glibc.static gpgme libassuan libgpgerror libseccomp libapparmor libselinux ]; prePatch = '' - export CFLAGS='-static' + export CFLAGS='-static -pthread' export LDFLAGS='-s -w -static-libgcc -static' export EXTRA_LDFLAGS='-s -w -linkmode external -extldflags "-static -lm"' export BUILDTAGS='static netgo osusergo exclude_graphdriver_btrfs exclude_graphdriver_devicemapper seccomp apparmor selinux' diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json index 81a2f974c..8e001f6b2 100644 --- a/nix/nixpkgs.json +++ b/nix/nixpkgs.json @@ -1,7 +1,10 @@ { "url": "https://github.com/nixos/nixpkgs", - "rev": "6e089d30148953df7abb3a1167169afc7848499c", - "date": "2020-11-05T09:56:30+01:00", - "sha256": "0ydqjkz7payl16psx445jwh6dc6lgbvj2w11xin1dqvbpcp03jcy", - "fetchSubmodules": false + "rev": "6ea2fd15d881006b41ea5bbed0f76bffcd85f9f9", + "date": "2020-12-20T13:26:58+10:00", + "path": "/nix/store/kyw1ackbp9qh1jzlzwmjvi5i3541ym5z-nixpkgs", + "sha256": "0kgqmw4ki10b37530jh912sn49x3gay5cnmfr8yz2yp8nvkrk236", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } |