From 8731a4797de289fe94753ab914c1b3d4dbd77642 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Fri, 6 Oct 2023 14:24:57 +0200 Subject: [PATCH] Enable packages served by PM gitlab --- overlay.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/overlay.nix b/overlay.nix index cbbbbaf..b53747b 100644 --- a/overlay.nix +++ b/overlay.nix @@ -10,38 +10,38 @@ let "printf '%s\n' ${toString (collect (x: x ? outPath) pkgs)} > $out"; bscPkgs = { - #bench6 = callPackage ./pkgs/bench6/default.nix { }; # FIXME: PM gitlab broken + bench6 = callPackage ./pkgs/bench6/default.nix { }; clangOmpss2 = callPackage ./pkgs/llvm-ompss2/default.nix { }; clangOmpss2Nanos6 = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nanos6; }; clangOmpss2Nodes = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nodes; }; clangOmpss2Unwrapped = callPackage ./pkgs/llvm-ompss2/clang.nix { }; #extrae = callPackage ./pkgs/extrae/default.nix { }; # Broken and outdated - #gpi-2 = callPackage ./pkgs/gpi-2/default.nix { }; # FIXME: PM gitlab broken + gpi-2 = callPackage ./pkgs/gpi-2/default.nix { }; intelPackages_2023 = callPackage ./pkgs/intel-oneapi/2023.nix { }; jemallocNanos6 = callPackage ./pkgs/nanos6/jemalloc.nix { }; #lmbench = callPackage ./pkgs/lmbench/default.nix { }; # Broken mcxx = callPackage ./pkgs/mcxx/default.nix { }; nanos6 = callPackage ./pkgs/nanos6/default.nix { }; nanos6Debug = final.nanos6.override { enableDebug = true; }; - #nixtools = callPackage ./pkgs/nixtools/default.nix { }; # FIXME: PM gitlab broken - #nix-wrap = callPackage ./pkgs/nix-wrap/default.nix { }; # FIXME: PM gitlab broken + nixtools = callPackage ./pkgs/nixtools/default.nix { }; + nix-wrap = callPackage ./pkgs/nix-wrap/default.nix { }; nodes = callPackage ./pkgs/nodes/default.nix { }; nosv = callPackage ./pkgs/nosv/default.nix { }; osumb = callPackage ./pkgs/osu/default.nix { }; ovni = callPackage ./pkgs/ovni/default.nix { }; ovniGit = final.ovni.override { useGit = true; }; paraverKernel = callPackage ./pkgs/paraver/kernel.nix { }; - #paraverKernelFast = callPackage ./pkgs/paraver/kernel-fast.nix { }; # Outdated + PM gitlab broken + #paraverKernelFast = callPackage ./pkgs/paraver/kernel-fast.nix { }; # Outdated #pscom = callPackage ./pkgs/parastation/pscom.nix { }; # Unmaintaned #psmpi = callPackage ./pkgs/parastation/psmpi.nix { }; # Unmaintaned - #sonar = callPackage ./pkgs/sonar/default.nix { }; # FIXME: PM gitlab broken + sonar = callPackage ./pkgs/sonar/default.nix { }; stdenvClangOmpss2 = final.stdenv.override { cc = final.clangOmpss2; allowedRequisites = null; }; stdenvClangOmpss2Nanos6 = final.stdenv.override { cc = final.clangOmpss2Nanos6; allowedRequisites = null; }; stdenvClangOmpss2Nodes = final.stdenv.override { cc = final.clangOmpss2Nodes; allowedRequisites = null; }; - #tagaspi = callPackage ./pkgs/tagaspi/default.nix { }; # FIXME: PM gitlab broken + tagaspi = callPackage ./pkgs/tagaspi/default.nix { }; tampi = callPackage ./pkgs/tampi/default.nix { }; wxparaver = callPackage ./pkgs/paraver/default.nix { }; - #wxparaverFast = callPackage ./pkgs/paraver/wxparaver-fast.nix { }; # Outdated + PM gitlab broken + #wxparaverFast = callPackage ./pkgs/paraver/wxparaver-fast.nix { }; # Outdated }; in bscPkgs // {