From 981d652a4d32a709698c92dfbda848af6ed7cb1f Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 8 Aug 2024 22:29:46 -0400 Subject: [PATCH 1/4] firecracker: 1.7.0 -> 1.8.0 --- .../virtualization/firecracker/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index fca5227177d4..a0fa2f76a420 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv }: let - version = "1.7.0"; + version = "1.8.0"; # nixpkgs-update: no auto update suffix = { @@ -11,9 +11,9 @@ let baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download"; - dlbin = sha256: fetchurl { + dlbin = hash: fetchurl { url = "${baseurl}/v${version}/firecracker-v${version}-${suffix}.tgz"; - sha256 = sha256."${stdenv.hostPlatform.system}"or (throw "unsupported system ${stdenv.hostPlatform.system}"); + hash = hash."${stdenv.hostPlatform.system}"or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; in @@ -23,8 +23,8 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-Vb0+bVmf3RCONuUvmu4jGfBsGKkPL6SbZOk/3wb1/1M="; - aarch64-linux = "sha256-PLoQA4a6qulxSns/ZRSgn6EtHr46/hstNhP1pAHt9VA="; + x86_64-linux = "sha256-vImb2u+NCqew+vv0miv2R+AphVj0+u5Elw2HocbRri0="; + aarch64-linux = "sha256-ZLSc61MWfXYWv0/Sxz3vaWoyAlnqbgfPFEfJCRxfknE="; }; dontConfigure = true; From d7bbd37ebe070281b880fb48c6bcbe0688062889 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 8 Aug 2024 22:30:29 -0400 Subject: [PATCH 2/4] firecracker: nixfmt --- .../virtualization/firecracker/default.nix | 37 +++++++++++++------ 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index a0fa2f76a420..c4e705206273 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,20 +1,29 @@ -{ fetchurl, lib, stdenv }: +{ + fetchurl, + lib, + stdenv, +}: let version = "1.8.0"; # nixpkgs-update: no auto update - suffix = { - x86_64-linux = "x86_64"; - aarch64-linux = "aarch64"; - }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + suffix = + { + x86_64-linux = "x86_64"; + aarch64-linux = "aarch64"; + } + ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download"; - dlbin = hash: fetchurl { - url = "${baseurl}/v${version}/firecracker-v${version}-${suffix}.tgz"; - hash = hash."${stdenv.hostPlatform.system}"or (throw "unsupported system ${stdenv.hostPlatform.system}"); - }; + dlbin = + hash: + fetchurl { + url = "${baseurl}/v${version}/firecracker-v${version}-${suffix}.tgz"; + hash = + hash."${stdenv.hostPlatform.system}" or (throw "unsupported system ${stdenv.hostPlatform.system}"); + }; in stdenv.mkDerivation { @@ -53,7 +62,13 @@ stdenv.mkDerivation { changelog = "https://github.com/firecracker-microvm/firecracker/releases/tag/v${version}"; mainProgram = "firecracker"; license = licenses.asl20; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ thoughtpolice qjoly ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + maintainers = with maintainers; [ + thoughtpolice + qjoly + ]; }; } From 307313162eefd4bda516b87d1fc9a5d2267acd25 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 8 Aug 2024 22:32:05 -0400 Subject: [PATCH 3/4] firecracker: move to pkgs/by-name --- .../default.nix => by-name/fi/firecracker/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/virtualization/firecracker/default.nix => by-name/fi/firecracker/package.nix} (100%) diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/by-name/fi/firecracker/package.nix similarity index 100% rename from pkgs/applications/virtualization/firecracker/default.nix rename to pkgs/by-name/fi/firecracker/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f038510a9820..4fc6e51607c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5108,8 +5108,6 @@ with pkgs; fioctl = callPackage ../tools/admin/fioctl { }; - firecracker = callPackage ../applications/virtualization/firecracker { }; - firectl = callPackage ../applications/virtualization/firectl { }; firestarter = callPackage ../applications/misc/firestarter { }; From 5ad7419dcd89517bc8f743166d7b58dcd0dfaa7e Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 8 Aug 2024 22:32:52 -0400 Subject: [PATCH 4/4] firecracker: add techknowlogick as maintainer --- pkgs/by-name/fi/firecracker/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fi/firecracker/package.nix b/pkgs/by-name/fi/firecracker/package.nix index c4e705206273..7f93af1ced70 100644 --- a/pkgs/by-name/fi/firecracker/package.nix +++ b/pkgs/by-name/fi/firecracker/package.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ thoughtpolice qjoly + techknowlogick ]; }; }