From 89bf973a18190a13090ff4e0384d549b2813015f Mon Sep 17 00:00:00 2001 From: Leon van Kammen Date: Fri, 24 Oct 2025 18:40:54 +0200 Subject: [PATCH] nix/docker.nix: added specific assimp-version --- nix/docker.nix | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/nix/docker.nix b/nix/docker.nix index 5f65f75..83ce7d2 100644 --- a/nix/docker.nix +++ b/nix/docker.nix @@ -22,14 +22,36 @@ let # generate the reproducable blob below via: # $ nix-shell -p nix-prefetch-docker --run 'nix-prefetch-docker ghcr.io/manyfold3d/manyfold-solo 0.120.0' + #manyfoldImage = pkgs.dockerTools.pullImage { + # imageName = "ghcr.io/manyfold3d/manyfold-solo"; + # imageDigest = "sha256:6250e562a05bf9476ddcfdc897a7b03cbf2090c727d9fe051afde486579b54a6"; + # sha256 = "sha256-V5y1N0l4JQjVDQbboGYX15MQaImXtP/HpNwPjDtxeJQ="; + # finalImageName = "ghcr.io/manyfold3d/manyfold-solo"; + # finalImageTag = "0.121.0"; + #}; + manyfoldImage = pkgs.dockerTools.pullImage { - imageName = "ghcr.io/manyfold3d/manyfold-solo"; - imageDigest = "sha256:6250e562a05bf9476ddcfdc897a7b03cbf2090c727d9fe051afde486579b54a6"; - sha256 = "sha256-V5y1N0l4JQjVDQbboGYX15MQaImXtP/HpNwPjDtxeJQ="; - finalImageName = "ghcr.io/manyfold3d/manyfold-solo"; - finalImageTag = "0.121.0"; + imageName = "ghcr.io/manyfold3d/manyfold-solo"; + imageDigest = "sha256:465399a2d296034ef84dba18a13744b567694c652387bd17fe97d51c672d1fa9"; + hash = "sha256-j7YSUGRFUDh6FJ1CrIQEzGU/0B8uPO8y1kd9lYLad4w="; + finalImageName = "ghcr.io/manyfold3d/manyfold-solo"; + finalImageTag = "latest"; }; + # generate the reproducable blob below via: + # $ nix-shell -p nix-prefetch-github --command 'nix-prefetch-github assimp assimp --rev e778c84cd62bc8b38d8e491ad3d2c27cb8ed37d5' + assimpSrc = pkgs.fetchFromGitHub { + "owner" = "assimp"; + "repo" = "assimp"; + "rev" = "e778c84cd62bc8b38d8e491ad3d2c27cb8ed37d5"; + "hash" = "sha256-ja5pFwpnzLT2MDIR8ISwC6+eA5UXyqRZW2CMCCrF1Q0="; + }; + myAssimp = pkgs.pkgsStatic.assimp.overrideAttrs (oldAttrs: { + inherit assimpSrc; # Set the source to the fetched commit + src = assimpSrc; + }); + + in rec { @@ -54,7 +76,7 @@ rec pkgs.pkgsStatic.inotify-tools # inotifywait e.g. pkgs.pkgsStatic.zip # inotifywait e.g. pkgs.pkgsStatic.ts # job management - pkgs.pkgsStatic.assimp # cli 3D editing/conversion + myAssimp # cli 3D editing/conversion ./.. ]; };