summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2022-03-23 15:15:13 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2022-03-23 15:17:12 -0400
commit346beec35a11393e9c59278d47b18de337c2b06f (patch)
treef50a9ef57597bae89b72d731cd7773d4ef673571
parentf049cba47c31d31a4a8ed9a9180f0e847be3411c (diff)
downloadpodman-346beec35a11393e9c59278d47b18de337c2b06f.tar.gz
podman-346beec35a11393e9c59278d47b18de337c2b06f.tar.bz2
podman-346beec35a11393e9c59278d47b18de337c2b06f.zip
Remove nix packages, since no one is supporting this
[NO NEW TESTS NEEDED] Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
-rw-r--r--Makefile16
-rw-r--r--nix/default-arm64.nix90
-rw-r--r--nix/default.nix88
-rw-r--r--nix/nixpkgs.json10
-rw-r--r--nix/nixpkgs.nix9
5 files changed, 0 insertions, 213 deletions
diff --git a/Makefile b/Makefile
index bef6b4b91..46c2b5ae3 100644
--- a/Makefile
+++ b/Makefile
@@ -435,22 +435,6 @@ local-cross: $(CROSS_BUILD_TARGETS) ## Cross compile podman binary for multiple
.PHONY: cross
cross: local-cross
-# Update nix/nixpkgs.json its latest stable commit
-.PHONY: nixpkgs
-nixpkgs:
- @nix run \
- -f channel:nixos-21.05 nix-prefetch-git \
- -c nix-prefetch-git \
- --no-deepClone \
- https://github.com/nixos/nixpkgs refs/heads/nixos-21.05 > nix/nixpkgs.json
-
-# Build statically linked binary
-.PHONY: static
-static:
- @nix build -f nix/
- mkdir -p ./bin
- cp -rfp ./result/bin/* ./bin/
-
.PHONY: build-no-cgo
build-no-cgo:
BUILDTAGS="containers_image_openpgp exclude_graphdriver_btrfs \
diff --git a/nix/default-arm64.nix b/nix/default-arm64.nix
deleted file mode 100644
index fa076f27d..000000000
--- a/nix/default-arm64.nix
+++ /dev/null
@@ -1,90 +0,0 @@
-let
- pkgs = (import ./nixpkgs.nix {
- crossSystem = {
- config = "aarch64-unknown-linux-gnu";
- };
- config = {
- packageOverrides = pkg: {
- gpgme = (static pkg.gpgme);
- libassuan = (static pkg.libassuan);
- libgpgerror = (static pkg.libgpgerror);
- libseccomp = (static pkg.libseccomp);
- glib = (static pkg.glib).overrideAttrs (x: {
- outputs = [ "bin" "out" "dev" ];
- mesonFlags = [
- "-Ddefault_library=static"
- "-Ddevbindir=${placeholder ''dev''}/bin"
- "-Dgtk_doc=false"
- "-Dnls=disabled"
- ];
- postInstall = ''
- moveToOutput "share/glib-2.0" "$dev"
- substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev"
- sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|"
- sed '1i#line 1 "${x.pname}-${x.version}/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"
- "--disable-libudev"
- "--disable-libusb"
- ];
- buildInputs = [ pkgs.python3 pkgs.dbus ];
- });
- systemd = (static pkg.systemd).overrideAttrs (x: {
- outputs = [ "out" "dev" ];
- mesonFlags = x.mesonFlags ++ [
- "-Dglib=false"
- "-Dstatic-libsystemd=true"
- ];
- });
- };
- };
- });
-
- static = pkg: pkg.overrideAttrs (x: {
- doCheck = false;
- configureFlags = (x.configureFlags or [ ]) ++ [
- "--without-shared"
- "--disable-shared"
- ];
- dontDisableStatic = true;
- enableSharedExecutables = false;
- enableStatic = true;
- });
-
- self = with pkgs; buildGoModule rec {
- name = "podman";
- src = builtins.filterSource
- (path: type: !(type == "directory" && baseNameOf path == "bin")) ./..;
- vendorSha256 = null;
- doCheck = false;
- enableParallelBuilding = true;
- outputs = [ "out" ];
- 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'
- 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 CGO_ENABLED=1
- '';
- buildPhase = ''
- patchShebangs .
- make bin/podman
- make bin/podman-remote
- make bin/rootlessport
- '';
- installPhase = ''
- install -Dm755 bin/podman $out/bin/podman
- install -Dm755 bin/podman-remote $out/bin/podman-remote
- install -Dm755 bin/rootlessport $out/libexec/podman/rootlessport
- '';
- };
-in
-self
diff --git a/nix/default.nix b/nix/default.nix
deleted file mode 100644
index 30ae21503..000000000
--- a/nix/default.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ system ? builtins.currentSystem }:
-let
- pkgs = (import ./nixpkgs.nix {
- config = {
- packageOverrides = pkg: {
- gpgme = (static pkg.gpgme);
- libassuan = (static pkg.libassuan);
- libgpgerror = (static pkg.libgpgerror);
- libseccomp = (static pkg.libseccomp);
- glib = (static pkg.glib).overrideAttrs (x: {
- outputs = [ "bin" "out" "dev" ];
- mesonFlags = [
- "-Ddefault_library=static"
- "-Ddevbindir=${placeholder ''dev''}/bin"
- "-Dgtk_doc=false"
- "-Dnls=disabled"
- ];
- postInstall = ''
- moveToOutput "share/glib-2.0" "$dev"
- substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev"
- sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|"
- sed '1i#line 1 "${x.pname}-${x.version}/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"
- "--disable-libudev"
- "--disable-libusb"
- ];
- buildInputs = [ pkgs.python3 pkgs.dbus ];
- });
- systemd = (static pkg.systemd).overrideAttrs (x: {
- outputs = [ "out" "dev" ];
- mesonFlags = x.mesonFlags ++ [
- "-Dglib=false"
- "-Dstatic-libsystemd=true"
- ];
- });
- };
- };
- });
-
- static = pkg: pkg.overrideAttrs (x: {
- doCheck = false;
- configureFlags = (x.configureFlags or [ ]) ++ [
- "--without-shared"
- "--disable-shared"
- ];
- dontDisableStatic = true;
- enableSharedExecutables = false;
- enableStatic = true;
- });
-
- self = with pkgs; buildGoModule rec {
- name = "podman";
- src = builtins.filterSource
- (path: type: !(type == "directory" && baseNameOf path == "bin")) ./..;
- vendorSha256 = null;
- doCheck = false;
- enableParallelBuilding = true;
- outputs = [ "out" ];
- 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'
- 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 CGO_ENABLED=1
- '';
- buildPhase = ''
- patchShebangs .
- make bin/podman
- make bin/podman-remote
- make bin/rootlessport
- '';
- installPhase = ''
- install -Dm755 bin/podman $out/bin/podman
- install -Dm755 bin/podman-remote $out/bin/podman-remote
- install -Dm755 bin/rootlessport $out/libexec/podman/rootlessport
- '';
- };
-in
-self
diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json
deleted file mode 100644
index efcfe202e..000000000
--- a/nix/nixpkgs.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "url": "https://github.com/nixos/nixpkgs",
- "rev": "2a96414d7e350160a33ed0978449c9ff5b5a6eb3",
- "date": "2021-07-13T18:21:47+02:00",
- "path": "/nix/store/2ai9q8ac6vxb2rrngdz82y8jxnk15cvm-nixpkgs",
- "sha256": "1dzrfqdjq3yq5jjskiqflzy58l2xx6059gay9p1k07zrlm1wigy5",
- "fetchSubmodules": false,
- "deepClone": false,
- "leaveDotGit": false
-}
diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix
deleted file mode 100644
index 11c20380a..000000000
--- a/nix/nixpkgs.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-let
- json = builtins.fromJSON (builtins.readFile ./nixpkgs.json);
- nixpkgs = import (builtins.fetchTarball {
- name = "nixos-unstable";
- url = "${json.url}/archive/${json.rev}.tar.gz";
- inherit (json) sha256;
- });
-in
-nixpkgs