github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-01 23:07:51 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Update nix pin with `make nixpkgs`
This commit is contained in:
Daniel J Walsh 2020-12-21 15:56:24 -05:00 committed by GitHub
commit 342b8398e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -114,7 +114,7 @@ binary: cmd/skopeo
# Update nix/nixpkgs.json its latest stable commit
.PHONY: 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
# Build statically linked binary

4
nix/default.nix
View File

@ -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 ];
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'

11
nix/nixpkgs.json
View File

@ -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
}