From 28bbec1802c69cd6eaa0cfed5ad6dcc0c0e1c517 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 28 Apr 2023 12:56:27 +0100 Subject: [PATCH] Drop version from ports to avoid IFD --- packages/genodelabs/default.nix | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/packages/genodelabs/default.nix b/packages/genodelabs/default.nix index 2525110..48d9ff1 100644 --- a/packages/genodelabs/default.nix +++ b/packages/genodelabs/default.nix @@ -48,23 +48,9 @@ let --replace "exec nm" "exec ${toolPrefix}nm" ''; - buildPhase = '' - echo { >> ports.nix - find repos/*/ports -name '*.hash' | while read hashFile - do - echo " $(basename --suffix=.hash $hashFile) = \"$(cut -c -6 $hashFile)\";" >> ports.nix - done - echo } >> ports.nix - ''; - installPhase = "cp -a . $out"; }; - portVersions = - # Port versions are taken from the sources to force - # updates of the port fixed-output derivations. - import "${genodeSources}/ports.nix"; - preparePort = # Prepare a "port" of source code declared in the Genode sources. # This is fragile because breakage can appear when the packages @@ -73,13 +59,11 @@ let name: { hash ? "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" , patches ? [ ], extraRepos ? [ ], ... }@args: - let - dontUnpack = patches == [ ] && extraRepos == [ ]; - version = portVersions.${name} or args.version; + let dontUnpack = patches == [ ] && extraRepos == [ ]; in with buildPackages.buildPackages; stdenvNoCC.mkDerivation (args // { - name = name + "-port-" + version; - inherit version patches dontUnpack extraRepos; + name = name + "-port"; + inherit patches dontUnpack extraRepos; preferLocalBuild = true; outputHashMode = "recursive"; outputHash = hash;