Skip to content

Commit

Permalink
use native linkFarm
Browse files Browse the repository at this point in the history
  • Loading branch information
xieby1 committed Nov 14, 2024
1 parent c7f404b commit b609a62
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 37 deletions.
9 changes: 3 additions & 6 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
url = "https://github.com/NixOS/nixpkgs/tarball/release-23.11";
sha256 = "sha256:1f5d2g1p6nfwycpmrnnmc2xmcszp804adp16knjvdkj8nz36y1fg";
}) {}
}: let
lib-customized = pkgs.callPackage ./lib-customized.nix {};
in rec {
}: rec {
riscv64-cc = pkgs.pkgsCross.riscv64.stdenv.cc;
riscv64-libc-static = pkgs.pkgsCross.riscv64.stdenv.cc.libc.static;
riscv64-fortran = let
Expand Down Expand Up @@ -37,11 +35,10 @@ in rec {
checkpointsAttrs = builtins.mapAttrs (name: benchmark:
import ./builders { inherit pkgs benchmark; }
) (pkgs.lib.filterAttrs (n: v: (pkgs.lib.isDerivation v)) spec2006);
# TODO: use native linkFarm
# TODO: rename
checkpoints = lib-customized.linkFarmNoEntries "checkpoints" (
checkpoints = (pkgs.linkFarm "checkpoints" (
pkgs.lib.mapAttrsToList ( name: path: {inherit name path; } ) checkpointsAttrs
);
)).overrideAttrs (old: { passthru = checkpointsAttrs; });

openblas = pkgs.callPackage ./benchmarks/openblas {
inherit riscv64-cc riscv64-fortran riscv64-libc-static;
Expand Down
31 changes: 0 additions & 31 deletions lib-customized.nix

This file was deleted.

0 comments on commit b609a62

Please sign in to comment.