github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-06-27 23:27:29 +00:00
Code Issues Projects Releases Wiki Activity

nix run -f channel:nixos-20.03

Browse Source 
Switch from nix `channel:nixpkgs-unstable` to `channel:nixos-20.03` for better stability.

Signed-off-by: Wong Hoi Sing Edison <hswong3i@gmail.com>
This commit is contained in:
Wong Hoi Sing Edison 2020-06-28 10:27:41 +08:00
parent ba8cbf589b
commit dd2e70e9b7
No known key found for this signature in database
GPG Key ID: 1FB1DE0629A57FD1
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -106,7 +106,7 @@ binary: cmd/skopeo
# Update nix/nixpkgs.json its latest master commit # Update nix/nixpkgs.json its latest master commit
.PHONY: nixpkgs .PHONY: nixpkgs
nixpkgs: nixpkgs:
@nix run -f channel:nixpkgs-unstable nix-prefetch-git -c nix-prefetch-git \ @nix run -f channel:nixos-20.03 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 w/o using containers # Build w/o using containers

8
nix/default.nix
View File

@ -11,8 +11,11 @@ let
}); });
static = pkg: pkg.overrideAttrs(x: { static = pkg: pkg.overrideAttrs(x: {
configureFlags = (x.configureFlags or []) ++ doCheck = false;
[ "--without-shared" "--disable-shared" ]; configureFlags = (x.configureFlags or []) ++ [
"--without-shared"
"--disable-shared"
];
dontDisableStatic = true; dontDisableStatic = true;
enableSharedExecutables = false; enableSharedExecutables = false;
enableStatic = true; enableStatic = true;
@ -27,6 +30,7 @@ let
nativeBuildInputs = [ git go-md2man installShellFiles makeWrapper pkg-config ]; nativeBuildInputs = [ git go-md2man installShellFiles makeWrapper pkg-config ];
buildInputs = [ glibc glibc.static gpgme libassuan libgpgerror ]; buildInputs = [ glibc glibc.static gpgme libassuan libgpgerror ];
prePatch = '' prePatch = ''
export CFLAGS='-static'
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 exclude_graphdriver_btrfs exclude_graphdriver_devicemapper' export BUILDTAGS='static netgo exclude_graphdriver_btrfs exclude_graphdriver_devicemapper'

11
nix/nixpkgs.json
View File

@ -1,10 +1,7 @@
{ {
"url": "https://github.com/nixos/nixpkgs", "url": "https://github.com/nixos/nixpkgs",
"rev": "78e324d2726127828a15f87a75b4d3199a8955ec", "rev": "87c5724af9f61be5e77034229078960690c1abe2",
"date": "2020-06-16T18:23:14-07:00", "date": "2020-06-28T22:14:24+01:00",
"path": "/nix/store/bwhp0061k3fk00j8fskpfak261jdcjl6-nixpkgs", "sha256": "1vg6iajb945b33nx674nnask6wai8zkjd4m0i9fcpdkwhwr0s46s",
"sha256": "1j58aa9ngdmvbnds4x4a497nynj390dzqyb5yrvmhjc7k9anq6jm", "fetchSubmodules": false
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
} }