opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 09:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8526 from alvistack/master-linux-amd64

Browse Source 
Update nix pin with `make nixpkgs`
This commit is contained in:
OpenShift Merge Robot
2020-12-21 12:53:36 +00:00
committed by GitHub
parent 5c6b5ef349 0599b21857
commit d6925182cd
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -226,7 +226,7 @@ bin/podman.cross.%: .gopathok
# Update nix/nixpkgs.json its latest stable commit # Update nix/nixpkgs.json its latest stable commit
.PHONY: nixpkgs .PHONY: nixpkgs
nixpkgs: nixpkgs:
@nix run -f channel:nixos-20.03 nix-prefetch-git -c nix-prefetch-git \ @nix run -f channel:nixos-20.09 nix-prefetch-git -c nix-prefetch-git \
--no-deepClone https://github.com/nixos/nixpkgs > nix/nixpkgs.json --no-deepClone https://github.com/nixos/nixpkgs > nix/nixpkgs.json
# Build statically linked binary # Build statically linked binary

4
nix/default.nix
View File

@ -38,10 +38,10 @@ let
doCheck = false; doCheck = false;
enableParallelBuilding = true; enableParallelBuilding = true;
outputs = [ "out" ]; 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 ]; buildInputs = [ glibc glibc.static gpgme libassuan libgpgerror libseccomp libapparmor libselinux ];
prePatch = '' prePatch = ''
export CFLAGS='-static' export CFLAGS='-static -pthread'
export LDFLAGS='-s -w -static-libgcc -static' export LDFLAGS='-s -w -static-libgcc -static'
export EXTRA_LDFLAGS='-s -w -linkmode external -extldflags "-static -lm"' export EXTRA_LDFLAGS='-s -w -linkmode external -extldflags "-static -lm"'
export BUILDTAGS='static netgo osusergo exclude_graphdriver_btrfs exclude_graphdriver_devicemapper seccomp apparmor selinux' export BUILDTAGS='static netgo osusergo exclude_graphdriver_btrfs exclude_graphdriver_devicemapper seccomp apparmor selinux'

11
nix/nixpkgs.json
View File

@ -1,7 +1,10 @@
{ {
"url": "https://github.com/nixos/nixpkgs", "url": "https://github.com/nixos/nixpkgs",
"rev": "6e089d30148953df7abb3a1167169afc7848499c", "rev": "6ea2fd15d881006b41ea5bbed0f76bffcd85f9f9",
"date": "2020-11-05T09:56:30+01:00", "date": "2020-12-20T13:26:58+10:00",
"sha256": "0ydqjkz7payl16psx445jwh6dc6lgbvj2w11xin1dqvbpcp03jcy", "path": "/nix/store/kyw1ackbp9qh1jzlzwmjvi5i3541ym5z-nixpkgs",
"fetchSubmodules": false "sha256": "0kgqmw4ki10b37530jh912sn49x3gay5cnmfr8yz2yp8nvkrk236",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
} }