Skip to content

Commit

Permalink
chore: update flake.lock, format using nixfmt-rfc-style in devShells
Browse files Browse the repository at this point in the history
  • Loading branch information
ryand56 committed Aug 1, 2024
1 parent 01e8b69 commit 42efb76
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 18 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
**/.direnv
/.envrc
result
examples/hello-world/.direnv
examples/hello-world/node_modules/.mf
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 23 additions & 12 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,27 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
};

outputs = { self, nixpkgs }:
let
supportedSystems = [ "x86_64-linux" ];
forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
pkgs = import nixpkgs { inherit system; };
});
in {
packages = forEachSupportedSystem ({ pkgs }: rec {
wrangler = pkgs.callPackage ./pkgs/wrangler/package.nix { };
default = wrangler;
});
};
outputs =
{ self, nixpkgs }:
let
supportedSystems = [ "x86_64-linux" ];
forEachSupportedSystem =
f: nixpkgs.lib.genAttrs supportedSystems (system: f { pkgs = import nixpkgs { inherit system; }; });
in
{
packages = forEachSupportedSystem (
{ pkgs }:
rec {
wrangler = pkgs.callPackage ./pkgs/wrangler/package.nix { };
default = wrangler;
}
);

devShells = forEachSupportedSystem (
{ pkgs }:
{
default = pkgs.mkShell { packages = with pkgs; [ nixfmt-rfc-style ]; };
}
);
};
}
11 changes: 8 additions & 3 deletions pkgs/wrangler/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,15 @@ let
# on certain subcommands due to this issue.
platforms = [ "x86_64-linux" ];
};
in
in
stdenv.mkDerivation (finalAttrs: {
inherit (pin) version;
inherit pname src pnpmDeps meta;
inherit (pin) version;
inherit
pname
src
pnpmDeps
meta
;

buildInputs = [
llvmPackages.libcxx
Expand Down

0 comments on commit 42efb76

Please sign in to comment.