From ecc79cd0821d4604711661cc5d38724afdfd4e3a Mon Sep 17 00:00:00 2001 From: pedohorse <13556996+pedohorse@users.noreply.github.com> Date: Wed, 4 Dec 2024 16:43:01 +0100 Subject: [PATCH 1/2] houdini: make unwrapped installation an optionally fixed derivation --- pkgs/by-name/ho/houdini/runtime-build.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ho/houdini/runtime-build.nix b/pkgs/by-name/ho/houdini/runtime-build.nix index 1c3083ebb7389..aa8f9308fd801 100644 --- a/pkgs/by-name/ho/houdini/runtime-build.nix +++ b/pkgs/by-name/ho/houdini/runtime-build.nix @@ -1,5 +1,5 @@ -{ stdenv, bc, version, src, eulaDate }: -stdenv.mkDerivation { +{ stdenv, bc, version, src, eulaDate, outputHash ? null }: +stdenv.mkDerivation ({ inherit version src; pname = "houdini-runtime"; @@ -16,7 +16,12 @@ stdenv.mkDerivation { --accept-EULA ${eulaDate} \ $out echo "licensingMode = localValidator" >> $out/houdini/Licensing.opt # does not seem to do anything any more. not sure, official docs do not say anything about it + sed -i 's@'"$out"'@$HFS@g' $out/packages/package_dirs.json # this seem to be internal houdini tools unavailable to users anyway, but they break fixed-derivation ''; dontFixup = true; -} +} // (if isNull outputHash then {} else { + inherit outputHash; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; +})) From 5abe3794ea4b0c6f1c007ad14941f1069d433f25 Mon Sep 17 00:00:00 2001 From: pedohorse <13556996+pedohorse@users.noreply.github.com> Date: Wed, 4 Dec 2024 16:43:25 +0100 Subject: [PATCH 2/2] houdini: 20.5.370 -> 20.5.445 --- pkgs/by-name/ho/houdini/runtime.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ho/houdini/runtime.nix b/pkgs/by-name/ho/houdini/runtime.nix index 170d6a3d1dd4b..ddc9f4a834f91 100644 --- a/pkgs/by-name/ho/houdini/runtime.nix +++ b/pkgs/by-name/ho/houdini/runtime.nix @@ -1,11 +1,12 @@ { requireFile, callPackage }: callPackage ./runtime-build.nix rec { - version = "20.5.370"; + version = "20.5.445"; eulaDate = "2021-10-13"; src = requireFile { name = "houdini-${version}-linux_x86_64_gcc11.2.tar.gz"; - hash = "sha256-QwPCU7E5yoJvWsiRUMBSAhEJYckbFTrQa1S4fto8dy0="; + hash = "sha256-rk8HKX1Aq7ACbAWKFxfjSzfa3PA/iXQZsYOkr/kSbkM="; url = "https://www.sidefx.com/download/daily-builds/?production=true"; }; + outputHash = "sha256-bdL+Ha5LWkty4r+rgPAKr50pxV+j7CLspD4KOsSxyMo="; }