Skip to content

Commit

Permalink
style: format with nixfmt/rfc101-style
Browse files Browse the repository at this point in the history
  • Loading branch information
ditsuke committed Feb 22, 2024
1 parent 3bd9a34 commit 7efb80d
Show file tree
Hide file tree
Showing 5 changed files with 231 additions and 248 deletions.
11 changes: 4 additions & 7 deletions .devops/nix/devshells.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@
perSystem =
{ config, lib, ... }:
{
devShells =
lib.concatMapAttrs
(name: package: {
${name} = package.passthru.shell;
${name + "-extra"} = package.passthru.shell-extra;
})
config.packages;
devShells = lib.concatMapAttrs (name: package: {
${name} = package.passthru.shell;
${name + "-extra"} = package.passthru.shell-extra;
}) config.packages;
};
}
18 changes: 8 additions & 10 deletions .devops/nix/nixpkgs-instances.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,14 @@
config.cudaSupport = true;
config.allowUnfreePredicate =
p:
builtins.all
(
license:
license.free
|| builtins.elem license.shortName [
"CUDA EULA"
"cuDNN EULA"
]
)
(p.meta.licenses or [ p.meta.license ]);
builtins.all (
license:
license.free
|| builtins.elem license.shortName [
"CUDA EULA"
"cuDNN EULA"
]
) (p.meta.licenses or [ p.meta.license ]);
};
# Ensure dependencies use ROCm consistently
pkgsRocm = import inputs.nixpkgs {
Expand Down
17 changes: 7 additions & 10 deletions .devops/nix/package-gguf-py.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
{ lib
, llamaVersion
, python3
} @inputs:
{
lib,
llamaVersion,
python3,
}@inputs:

python3.pkgs.buildPythonPackage rec {
pname = "gguf";
version = llamaVersion;
pyproject = true;
nativeBuildInputs = with python3.pkgs; [
poetry-core
];
propagatedBuildInputs = with python3.pkgs; [
numpy
];
nativeBuildInputs = with python3.pkgs; [ poetry-core ];
propagatedBuildInputs = with python3.pkgs; [ numpy ];
src = lib.cleanSource ../../gguf-py;
doCheck = false;
meta = with lib; {
Expand Down
Loading

0 comments on commit 7efb80d

Please sign in to comment.