diff --git a/overlay.nix b/overlay.nix index 96d1f73..9389423 100644 --- a/overlay.nix +++ b/overlay.nix @@ -10,37 +10,37 @@ let "printf '%s\n' ${toString (collect (x: x ? outPath) pkgs)} > $out"; bscPkgs = { - #bench6 = callPackage ./bsc/bench6/default.nix { }; - clangOmpss2 = callPackage ./bsc/llvm-ompss2/default.nix { }; - clangOmpss2Nanos6 = callPackage ./bsc/llvm-ompss2/default.nix { ompss2rt = final.nanos6; }; - clangOmpss2Nodes = callPackage ./bsc/llvm-ompss2/default.nix { ompss2rt = final.nodes; }; - clangOmpss2Unwrapped = callPackage ./bsc/llvm-ompss2/clang.nix { }; - #extrae = callPackage ./bsc/extrae/default.nix { }; # Broken and outdated - #gpi-2 = callPackage ./bsc/gpi-2/default.nix { }; - intelPackages_2023 = callPackage ./bsc/intel-oneapi/2023.nix { }; - jemallocNanos6 = callPackage ./bsc/nanos6/jemalloc.nix { }; - #lmbench = callPackage ./bsc/lmbench/default.nix { }; - mcxx = callPackage ./bsc/mcxx/default.nix { }; - nanos6 = callPackage ./bsc/nanos6/default.nix { }; + #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 { }; + intelPackages_2023 = callPackage ./pkgs/intel-oneapi/2023.nix { }; + jemallocNanos6 = callPackage ./pkgs/nanos6/jemalloc.nix { }; + #lmbench = callPackage ./pkgs/lmbench/default.nix { }; + mcxx = callPackage ./pkgs/mcxx/default.nix { }; + nanos6 = callPackage ./pkgs/nanos6/default.nix { }; nanos6Debug = final.nanos6.override { enableDebug = true; }; - #nixtools = callPackage ./bsc/nixtools/default.nix { }; - #nix-wrap = callPackage ./bsc/nix-wrap/default.nix { }; - nodes = callPackage ./bsc/nodes/default.nix { }; - nosv = callPackage ./bsc/nosv/default.nix { }; - osumb = callPackage ./bsc/osu/default.nix { }; - ovni = callPackage ./bsc/ovni/default.nix { }; + #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 ./bsc/paraver/kernel.nix { }; - #paraverKernelFast = callPackage ./bsc/paraver/kernel-fast.nix { }; - #pscom = callPackage ./bsc/parastation/pscom.nix { }; - #psmpi = callPackage ./bsc/parastation/psmpi.nix { }; - #sonar = callPackage ./bsc/sonar/default.nix { }; + paraverKernel = callPackage ./pkgs/paraver/kernel.nix { }; + #paraverKernelFast = callPackage ./pkgs/paraver/kernel-fast.nix { }; + #pscom = callPackage ./pkgs/parastation/pscom.nix { }; + #psmpi = callPackage ./pkgs/parastation/psmpi.nix { }; + #sonar = callPackage ./pkgs/sonar/default.nix { }; stdenvClangOmpss2Nanos6 = final.stdenv.override { cc = final.clangOmpss2Nanos6; allowedRequisites = null; }; stdenvClangOmpss2Nodes = final.stdenv.override { cc = final.clangOmpss2Nodes; allowedRequisites = null; }; - #tagaspi = callPackage ./bsc/tagaspi/default.nix { }; - tampi = callPackage ./bsc/tampi/default.nix { }; - wxparaver = callPackage ./bsc/paraver/default.nix { }; - #wxparaverFast = callPackage ./bsc/paraver/wxparaver-fast.nix { }; + #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 { }; }; in bscPkgs // { diff --git a/bsc/babeltrace/default.nix b/pkgs/babeltrace/default.nix similarity index 100% rename from bsc/babeltrace/default.nix rename to pkgs/babeltrace/default.nix diff --git a/bsc/babeltrace2/default.nix b/pkgs/babeltrace2/default.nix similarity index 100% rename from bsc/babeltrace2/default.nix rename to pkgs/babeltrace2/default.nix diff --git a/bsc/bench6/default.nix b/pkgs/bench6/default.nix similarity index 100% rename from bsc/bench6/default.nix rename to pkgs/bench6/default.nix diff --git a/bsc/clsync/default.nix b/pkgs/clsync/default.nix similarity index 100% rename from bsc/clsync/default.nix rename to pkgs/clsync/default.nix diff --git a/bsc/cn6/default.nix b/pkgs/cn6/default.nix similarity index 100% rename from bsc/cn6/default.nix rename to pkgs/cn6/default.nix diff --git a/bsc/cpuid/default.nix b/pkgs/cpuid/default.nix similarity index 100% rename from bsc/cpuid/default.nix rename to pkgs/cpuid/default.nix diff --git a/bsc/dummy/default.nix b/pkgs/dummy/default.nix similarity index 100% rename from bsc/dummy/default.nix rename to pkgs/dummy/default.nix diff --git a/bsc/extrae/PTR.patch b/pkgs/extrae/PTR.patch similarity index 100% rename from bsc/extrae/PTR.patch rename to pkgs/extrae/PTR.patch diff --git a/bsc/extrae/default.nix b/pkgs/extrae/default.nix similarity index 100% rename from bsc/extrae/default.nix rename to pkgs/extrae/default.nix diff --git a/bsc/extrae/use-command.patch b/pkgs/extrae/use-command.patch similarity index 100% rename from bsc/extrae/use-command.patch rename to pkgs/extrae/use-command.patch diff --git a/bsc/fftw/default.nix b/pkgs/fftw/default.nix similarity index 100% rename from bsc/fftw/default.nix rename to pkgs/fftw/default.nix diff --git a/bsc/gpi-2/default.nix b/pkgs/gpi-2/default.nix similarity index 100% rename from bsc/gpi-2/default.nix rename to pkgs/gpi-2/default.nix diff --git a/bsc/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch b/pkgs/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch similarity index 100% rename from bsc/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch rename to pkgs/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch diff --git a/bsc/groff/default.nix b/pkgs/groff/default.nix similarity index 100% rename from bsc/groff/default.nix rename to pkgs/groff/default.nix diff --git a/bsc/groff/site.tmac b/pkgs/groff/site.tmac similarity index 100% rename from bsc/groff/site.tmac rename to pkgs/groff/site.tmac diff --git a/bsc/hwloc/1.11.6/default.nix b/pkgs/hwloc/1.11.6/default.nix similarity index 100% rename from bsc/hwloc/1.11.6/default.nix rename to pkgs/hwloc/1.11.6/default.nix diff --git a/bsc/intel-compiler/default.nix b/pkgs/intel-compiler/default.nix similarity index 100% rename from bsc/intel-compiler/default.nix rename to pkgs/intel-compiler/default.nix diff --git a/bsc/intel-compiler/icc2020.nix b/pkgs/intel-compiler/icc2020.nix similarity index 100% rename from bsc/intel-compiler/icc2020.nix rename to pkgs/intel-compiler/icc2020.nix diff --git a/bsc/intel-compiler/icc2021.nix b/pkgs/intel-compiler/icc2021.nix similarity index 100% rename from bsc/intel-compiler/icc2021.nix rename to pkgs/intel-compiler/icc2021.nix diff --git a/bsc/intel-compiler/license.nix b/pkgs/intel-compiler/license.nix similarity index 100% rename from bsc/intel-compiler/license.nix rename to pkgs/intel-compiler/license.nix diff --git a/bsc/intel-compiler/wrapper2021.nix b/pkgs/intel-compiler/wrapper2021.nix similarity index 100% rename from bsc/intel-compiler/wrapper2021.nix rename to pkgs/intel-compiler/wrapper2021.nix diff --git a/bsc/intel-mpi/default.nix b/pkgs/intel-mpi/default.nix similarity index 100% rename from bsc/intel-mpi/default.nix rename to pkgs/intel-mpi/default.nix diff --git a/bsc/intel-mpi/mpicc.patch b/pkgs/intel-mpi/mpicc.patch similarity index 100% rename from bsc/intel-mpi/mpicc.patch rename to pkgs/intel-mpi/mpicc.patch diff --git a/bsc/intel-mpi/mpicxx.patch b/pkgs/intel-mpi/mpicxx.patch similarity index 100% rename from bsc/intel-mpi/mpicxx.patch rename to pkgs/intel-mpi/mpicxx.patch diff --git a/bsc/intel-oneapi/2023.nix b/pkgs/intel-oneapi/2023.nix similarity index 100% rename from bsc/intel-oneapi/2023.nix rename to pkgs/intel-oneapi/2023.nix diff --git a/bsc/intel-oneapi/all-packages b/pkgs/intel-oneapi/all-packages similarity index 100% rename from bsc/intel-oneapi/all-packages rename to pkgs/intel-oneapi/all-packages diff --git a/bsc/intel-oneapi/amd64-packages b/pkgs/intel-oneapi/amd64-packages similarity index 100% rename from bsc/intel-oneapi/amd64-packages rename to pkgs/intel-oneapi/amd64-packages diff --git a/bsc/intel-oneapi/update.sh b/pkgs/intel-oneapi/update.sh similarity index 100% rename from bsc/intel-oneapi/update.sh rename to pkgs/intel-oneapi/update.sh diff --git a/bsc/libpsm2/default.nix b/pkgs/libpsm2/default.nix similarity index 100% rename from bsc/libpsm2/default.nix rename to pkgs/libpsm2/default.nix diff --git a/bsc/llvm-ompss2/clang.nix b/pkgs/llvm-ompss2/clang.nix similarity index 100% rename from bsc/llvm-ompss2/clang.nix rename to pkgs/llvm-ompss2/clang.nix diff --git a/bsc/llvm-ompss2/default.nix b/pkgs/llvm-ompss2/default.nix similarity index 100% rename from bsc/llvm-ompss2/default.nix rename to pkgs/llvm-ompss2/default.nix diff --git a/bsc/lmbench/default.nix b/pkgs/lmbench/default.nix similarity index 100% rename from bsc/lmbench/default.nix rename to pkgs/lmbench/default.nix diff --git a/bsc/mcxx/default.nix b/pkgs/mcxx/default.nix similarity index 100% rename from bsc/mcxx/default.nix rename to pkgs/mcxx/default.nix diff --git a/bsc/mcxx/git.nix b/pkgs/mcxx/git.nix similarity index 100% rename from bsc/mcxx/git.nix rename to pkgs/mcxx/git.nix diff --git a/bsc/mcxx/intel.patch b/pkgs/mcxx/intel.patch similarity index 100% rename from bsc/mcxx/intel.patch rename to pkgs/mcxx/intel.patch diff --git a/bsc/mcxx/rarias.nix b/pkgs/mcxx/rarias.nix similarity index 100% rename from bsc/mcxx/rarias.nix rename to pkgs/mcxx/rarias.nix diff --git a/bsc/mpich/default.nix b/pkgs/mpich/default.nix similarity index 100% rename from bsc/mpich/default.nix rename to pkgs/mpich/default.nix diff --git a/bsc/nanos6/default.nix b/pkgs/nanos6/default.nix similarity index 100% rename from bsc/nanos6/default.nix rename to pkgs/nanos6/default.nix diff --git a/bsc/nanos6/jemalloc.nix b/pkgs/nanos6/jemalloc.nix similarity index 100% rename from bsc/nanos6/jemalloc.nix rename to pkgs/nanos6/jemalloc.nix diff --git a/bsc/nix-wrap/default.nix b/pkgs/nix-wrap/default.nix similarity index 100% rename from bsc/nix-wrap/default.nix rename to pkgs/nix-wrap/default.nix diff --git a/bsc/nix/default.nix b/pkgs/nix/default.nix similarity index 100% rename from bsc/nix/default.nix rename to pkgs/nix/default.nix diff --git a/bsc/nix/static.nix b/pkgs/nix/static.nix similarity index 100% rename from bsc/nix/static.nix rename to pkgs/nix/static.nix diff --git a/bsc/nix/upload.sh b/pkgs/nix/upload.sh similarity index 100% rename from bsc/nix/upload.sh rename to pkgs/nix/upload.sh diff --git a/bsc/nixtools/default.nix b/pkgs/nixtools/default.nix similarity index 100% rename from bsc/nixtools/default.nix rename to pkgs/nixtools/default.nix diff --git a/bsc/nodes/default.nix b/pkgs/nodes/default.nix similarity index 100% rename from bsc/nodes/default.nix rename to pkgs/nodes/default.nix diff --git a/bsc/nosv/default.nix b/pkgs/nosv/default.nix similarity index 100% rename from bsc/nosv/default.nix rename to pkgs/nosv/default.nix diff --git a/bsc/openmpi/default.nix b/pkgs/openmpi/default.nix similarity index 100% rename from bsc/openmpi/default.nix rename to pkgs/openmpi/default.nix diff --git a/bsc/openmpi/with-slurm.nix b/pkgs/openmpi/with-slurm.nix similarity index 100% rename from bsc/openmpi/with-slurm.nix rename to pkgs/openmpi/with-slurm.nix diff --git a/bsc/osu/default.nix b/pkgs/osu/default.nix similarity index 100% rename from bsc/osu/default.nix rename to pkgs/osu/default.nix diff --git a/bsc/otf/default.nix b/pkgs/otf/default.nix similarity index 100% rename from bsc/otf/default.nix rename to pkgs/otf/default.nix diff --git a/bsc/otf/printf.patch b/pkgs/otf/printf.patch similarity index 100% rename from bsc/otf/printf.patch rename to pkgs/otf/printf.patch diff --git a/bsc/ovni/default.nix b/pkgs/ovni/default.nix similarity index 100% rename from bsc/ovni/default.nix rename to pkgs/ovni/default.nix diff --git a/bsc/parastation/pscom.nix b/pkgs/parastation/pscom.nix similarity index 100% rename from bsc/parastation/pscom.nix rename to pkgs/parastation/pscom.nix diff --git a/bsc/parastation/psmpi.nix b/pkgs/parastation/psmpi.nix similarity index 100% rename from bsc/parastation/psmpi.nix rename to pkgs/parastation/psmpi.nix diff --git a/bsc/paraver/default.nix b/pkgs/paraver/default.nix similarity index 100% rename from bsc/paraver/default.nix rename to pkgs/paraver/default.nix diff --git a/bsc/paraver/dont-expand-colors.patch b/pkgs/paraver/dont-expand-colors.patch similarity index 100% rename from bsc/paraver/dont-expand-colors.patch rename to pkgs/paraver/dont-expand-colors.patch diff --git a/bsc/paraver/kernel-fast.nix b/pkgs/paraver/kernel-fast.nix similarity index 100% rename from bsc/paraver/kernel-fast.nix rename to pkgs/paraver/kernel-fast.nix diff --git a/bsc/paraver/kernel.nix b/pkgs/paraver/kernel.nix similarity index 100% rename from bsc/paraver/kernel.nix rename to pkgs/paraver/kernel.nix diff --git a/bsc/paraver/mouse-label.patch b/pkgs/paraver/mouse-label.patch similarity index 100% rename from bsc/paraver/mouse-label.patch rename to pkgs/paraver/mouse-label.patch diff --git a/bsc/paraver/release.nix b/pkgs/paraver/release.nix similarity index 100% rename from bsc/paraver/release.nix rename to pkgs/paraver/release.nix diff --git a/bsc/paraver/wxparaver-fast.nix b/pkgs/paraver/wxparaver-fast.nix similarity index 100% rename from bsc/paraver/wxparaver-fast.nix rename to pkgs/paraver/wxparaver-fast.nix diff --git a/bsc/paraver/wxparaver-fast.patch b/pkgs/paraver/wxparaver-fast.patch similarity index 100% rename from bsc/paraver/wxparaver-fast.patch rename to pkgs/paraver/wxparaver-fast.patch diff --git a/bsc/paraver/wxparaver.nix b/pkgs/paraver/wxparaver.nix similarity index 100% rename from bsc/paraver/wxparaver.nix rename to pkgs/paraver/wxparaver.nix diff --git a/bsc/perf/default.nix b/pkgs/perf/default.nix similarity index 100% rename from bsc/perf/default.nix rename to pkgs/perf/default.nix diff --git a/bsc/pmix/pmix2.nix b/pkgs/pmix/pmix2.nix similarity index 100% rename from bsc/pmix/pmix2.nix rename to pkgs/pmix/pmix2.nix diff --git a/bsc/rdma-core/default.nix b/pkgs/rdma-core/default.nix similarity index 100% rename from bsc/rdma-core/default.nix rename to pkgs/rdma-core/default.nix diff --git a/bsc/slurm/16.05.8.1/common-env-echo.patch b/pkgs/slurm/16.05.8.1/common-env-echo.patch similarity index 100% rename from bsc/slurm/16.05.8.1/common-env-echo.patch rename to pkgs/slurm/16.05.8.1/common-env-echo.patch diff --git a/bsc/slurm/16.05.8.1/default.nix b/pkgs/slurm/16.05.8.1/default.nix similarity index 100% rename from bsc/slurm/16.05.8.1/default.nix rename to pkgs/slurm/16.05.8.1/default.nix diff --git a/bsc/slurm/16.05.8.1/major.patch b/pkgs/slurm/16.05.8.1/major.patch similarity index 100% rename from bsc/slurm/16.05.8.1/major.patch rename to pkgs/slurm/16.05.8.1/major.patch diff --git a/bsc/slurm/16.05.8.1/mvwprintw.patch b/pkgs/slurm/16.05.8.1/mvwprintw.patch similarity index 100% rename from bsc/slurm/16.05.8.1/mvwprintw.patch rename to pkgs/slurm/16.05.8.1/mvwprintw.patch diff --git a/bsc/slurm/16.05.8.1/pmi2.nix b/pkgs/slurm/16.05.8.1/pmi2.nix similarity index 100% rename from bsc/slurm/16.05.8.1/pmi2.nix rename to pkgs/slurm/16.05.8.1/pmi2.nix diff --git a/bsc/slurm/16.05.8.1/pmix-configure.patch b/pkgs/slurm/16.05.8.1/pmix-configure.patch similarity index 100% rename from bsc/slurm/16.05.8.1/pmix-configure.patch rename to pkgs/slurm/16.05.8.1/pmix-configure.patch diff --git a/bsc/slurm/default.nix b/pkgs/slurm/default.nix similarity index 100% rename from bsc/slurm/default.nix rename to pkgs/slurm/default.nix diff --git a/bsc/slurm/pmi2.nix b/pkgs/slurm/pmi2.nix similarity index 100% rename from bsc/slurm/pmi2.nix rename to pkgs/slurm/pmi2.nix diff --git a/bsc/sonar/default.nix b/pkgs/sonar/default.nix similarity index 100% rename from bsc/sonar/default.nix rename to pkgs/sonar/default.nix diff --git a/bsc/tagaspi/default.nix b/pkgs/tagaspi/default.nix similarity index 100% rename from bsc/tagaspi/default.nix rename to pkgs/tagaspi/default.nix diff --git a/bsc/tampi/default.nix b/pkgs/tampi/default.nix similarity index 100% rename from bsc/tampi/default.nix rename to pkgs/tampi/default.nix diff --git a/bsc/tampi/git.nix b/pkgs/tampi/git.nix similarity index 100% rename from bsc/tampi/git.nix rename to pkgs/tampi/git.nix diff --git a/bsc/vite/cmake.patch b/pkgs/vite/cmake.patch similarity index 100% rename from bsc/vite/cmake.patch rename to pkgs/vite/cmake.patch diff --git a/bsc/vite/default.nix b/pkgs/vite/default.nix similarity index 100% rename from bsc/vite/default.nix rename to pkgs/vite/default.nix diff --git a/bsc/vtk/default.nix b/pkgs/vtk/default.nix similarity index 100% rename from bsc/vtk/default.nix rename to pkgs/vtk/default.nix