summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWong Hoi Sing Edison <hswong3i@pantarei-design.com>2021-06-03 11:16:17 +0800
committerWong Hoi Sing Edison <hswong3i@pantarei-design.com>2021-06-10 10:36:38 +0800
commite7e09bf2f0abdbfa6a1cc7f75bfbd795f80624d6 (patch)
tree93eb7efa2553c8b99a3042ab5a4272f327fca331
parentea39735845655aaf77de577a35557a0fb003514f (diff)
downloadpodman-e7e09bf2f0abdbfa6a1cc7f75bfbd795f80624d6.tar.gz
podman-e7e09bf2f0abdbfa6a1cc7f75bfbd795f80624d6.tar.bz2
podman-e7e09bf2f0abdbfa6a1cc7f75bfbd795f80624d6.zip
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>
-rw-r--r--Makefile4
-rw-r--r--nix/default-arm64.nix19
-rw-r--r--nix/default.nix19
-rw-r--r--nix/nixpkgs.json8
-rw-r--r--nix/nixpkgs.nix3
5 files changed, 42 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 4a7c727de..f2b9d87de 100644
--- a/Makefile
+++ b/Makefile
@@ -389,10 +389,10 @@ cross: local-cross
.PHONY: nixpkgs
nixpkgs:
@nix run \
- -f channel:nixos-20.09 nix-prefetch-git \
+ -f channel:nixos-21.05 nix-prefetch-git \
-c nix-prefetch-git \
--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
.PHONY: static
diff --git a/nix/default-arm64.nix b/nix/default-arm64.nix
index 3e374c1bd..d29f75520 100644
--- a/nix/default-arm64.nix
+++ b/nix/default-arm64.nix
@@ -25,6 +25,21 @@ let
-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;
enableParallelBuilding = true;
outputs = [ "out" ];
- nativeBuildInputs = [ bash gitMinimal go-md2man installShellFiles makeWrapper pkg-config which ];
- buildInputs = [ glibc glibc.static gpgme libassuan libgpgerror libseccomp libapparmor libselinux ];
+ nativeBuildInputs = [ bash gitMinimal go-md2man pkg-config which ];
+ buildInputs = [ glibc glibc.static glib gpgme libassuan libgpgerror libseccomp libapparmor libselinux ];
prePatch = ''
export CFLAGS='-static -pthread'
export LDFLAGS='-s -w -static-libgcc -static'
diff --git a/nix/default.nix b/nix/default.nix
index aae520c9e..f6194e3d9 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -23,6 +23,21 @@ let
-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;
enableParallelBuilding = true;
outputs = [ "out" ];
- nativeBuildInputs = [ bash gitMinimal go-md2man installShellFiles makeWrapper pkg-config which ];
- buildInputs = [ glibc glibc.static gpgme libassuan libgpgerror libseccomp libapparmor libselinux ];
+ nativeBuildInputs = [ bash gitMinimal go-md2man pkg-config which ];
+ buildInputs = [ glibc glibc.static glib gpgme libassuan libgpgerror libseccomp libapparmor libselinux ];
prePatch = ''
export CFLAGS='-static -pthread'
export LDFLAGS='-s -w -static-libgcc -static'
diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json
index 9b8b8289e..a9771eade 100644
--- a/nix/nixpkgs.json
+++ b/nix/nixpkgs.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/nixos/nixpkgs",
- "rev": "eb7e1ef185f6c990cda5f71fdc4fb02e76ab06d5",
- "date": "2021-05-05T23:16:00+02:00",
- "path": "/nix/store/a98lkhjlsqh32ic2kkrv5kkik6jy25wh-nixpkgs",
- "sha256": "1ibz204c41g7baqga2iaj11yz9l75cfdylkiqjnk5igm81ivivxg",
+ "rev": "60cce7e5e1fdf62421ef6d4184ee399b46209366",
+ "date": "2021-06-09T01:18:50-04:00",
+ "path": "/nix/store/fixgn194626rb7gf99l9jaqm0hbqn2ix-nixpkgs",
+ "sha256": "100xrb925cana1kfd0c7gwkjjalq891vfgr0rn1gl9j8gp3l3gx6",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix
index 21e7f17a2..11c20380a 100644
--- a/nix/nixpkgs.nix
+++ b/nix/nixpkgs.nix
@@ -5,4 +5,5 @@ let
url = "${json.url}/archive/${json.rev}.tar.gz";
inherit (json) sha256;
});
-in nixpkgs
+in
+nixpkgs