containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update nix pin with `make nixpkgs` 

- Bugfix `make nixpkgs` which pin with branch `nixos-21.05`
  - Code lint with `nixpkgs-fmt`
  - Code sync between x86\_64 and aarch64

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
This commit is contained in:
Wong Hoi Sing Edison 2021-06-03 11:16:17 +08:00
parent ea39735845
commit e7e09bf2f0
No known key found for this signature in database
GPG Key ID: 0F0D6A60644E28D3
5 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -389,10 +389,10 @@ cross: local-cross
.PHONY: nixpkgs .PHONY: nixpkgs
nixpkgs: nixpkgs:
@nix run \ @nix run \
-f channel:nixos-20.09 nix-prefetch-git \ -f channel:nixos-21.05 nix-prefetch-git \
-c nix-prefetch-git \ -c nix-prefetch-git \
--no-deepClone \ --no-deepClone \
https://github.com/nixos/nixpkgs refs/heads/nixos-20.09 > nix/nixpkgs.json https://github.com/nixos/nixpkgs refs/heads/nixos-21.05 > nix/nixpkgs.json
# Build statically linked binary # Build statically linked binary
.PHONY: static .PHONY: static

19
nix/default-arm64.nix
View File

@ -25,6 +25,21 @@ let
-i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c
''; '';
}); });
pcsclite = (static pkg.pcsclite).overrideAttrs (x: {
configureFlags = [
"--enable-confdir=/etc"
"--enable-usbdropdir=/var/lib/pcsc/drivers"
"--disable-libsystemd"
];
buildInputs = [ pkgs.python3 pkgs.udev pkgs.dbus pkgs.systemd ];
});
systemd = (static pkg.systemd).overrideAttrs (x: {
outputs = [ "out" "dev" ];
mesonFlags = x.mesonFlags ++ [
"-Dglib=false"
"-Dstatic-libsystemd=true"
];
});
}; };
}; };
}); });
@ -47,8 +62,8 @@ let
doCheck = false; doCheck = false;
enableParallelBuilding = true; enableParallelBuilding = true;
outputs = [ "out" ]; outputs = [ "out" ];
nativeBuildInputs = [ bash gitMinimal go-md2man installShellFiles makeWrapper pkg-config which ]; nativeBuildInputs = [ bash gitMinimal go-md2man pkg-config which ];
buildInputs = [ glibc glibc.static gpgme libassuan libgpgerror libseccomp libapparmor libselinux ]; buildInputs = [ glibc glibc.static glib gpgme libassuan libgpgerror libseccomp libapparmor libselinux ];
prePatch = '' prePatch = ''
export CFLAGS='-static -pthread' export CFLAGS='-static -pthread'
export LDFLAGS='-s -w -static-libgcc -static' export LDFLAGS='-s -w -static-libgcc -static'

19
nix/default.nix
View File

@ -23,6 +23,21 @@ let
-i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c
''; '';
}); });
pcsclite = (static pkg.pcsclite).overrideAttrs (x: {
configureFlags = [
"--enable-confdir=/etc"
"--enable-usbdropdir=/var/lib/pcsc/drivers"
"--with-systemdsystemunitdir=${placeholder "bin"}/lib/systemd/system"
];
buildInputs = [ pkgs.python3 pkgs.udev pkgs.dbus pkgs.systemd ];
});
systemd = (static pkg.systemd).overrideAttrs (x: {
outputs = [ "out" "dev" ];
mesonFlags = x.mesonFlags ++ [
"-Dglib=false"
"-Dstatic-libsystemd=true"
];
});
}; };
}; };
}); });
@ -45,8 +60,8 @@ let
doCheck = false; doCheck = false;
enableParallelBuilding = true; enableParallelBuilding = true;
outputs = [ "out" ]; outputs = [ "out" ];
nativeBuildInputs = [ bash gitMinimal go-md2man installShellFiles makeWrapper pkg-config which ]; nativeBuildInputs = [ bash gitMinimal go-md2man pkg-config which ];
buildInputs = [ glibc glibc.static gpgme libassuan libgpgerror libseccomp libapparmor libselinux ]; buildInputs = [ glibc glibc.static glib gpgme libassuan libgpgerror libseccomp libapparmor libselinux ];
prePatch = '' prePatch = ''
export CFLAGS='-static -pthread' export CFLAGS='-static -pthread'
export LDFLAGS='-s -w -static-libgcc -static' export LDFLAGS='-s -w -static-libgcc -static'

8
nix/nixpkgs.json
View File

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/nixos/nixpkgs", "url": "https://github.com/nixos/nixpkgs",
"rev": "eb7e1ef185f6c990cda5f71fdc4fb02e76ab06d5", "rev": "60cce7e5e1fdf62421ef6d4184ee399b46209366",
"date": "2021-05-05T23:16:00+02:00", "date": "2021-06-09T01:18:50-04:00",
"path": "/nix/store/a98lkhjlsqh32ic2kkrv5kkik6jy25wh-nixpkgs", "path": "/nix/store/fixgn194626rb7gf99l9jaqm0hbqn2ix-nixpkgs",
"sha256": "1ibz204c41g7baqga2iaj11yz9l75cfdylkiqjnk5igm81ivivxg", "sha256": "100xrb925cana1kfd0c7gwkjjalq891vfgr0rn1gl9j8gp3l3gx6",
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,
"leaveDotGit": false "leaveDotGit": false

3
nix/nixpkgs.nix
View File

@ -5,4 +5,5 @@ let
url = "${json.url}/archive/${json.rev}.tar.gz"; url = "${json.url}/archive/${json.rev}.tar.gz";
inherit (json) sha256; inherit (json) sha256;
}); });
in nixpkgs in
nixpkgs