Skip to content

Commit

Permalink
more tweaking?
Browse files Browse the repository at this point in the history
  • Loading branch information
jpetrucciani committed Oct 26, 2024
1 parent 5b8bfc4 commit ff716ad
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 25 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ regular import:
let
pog = import (fetchTarball {
name = "pog-2024-10-25";
url = "https://github.com/jpetrucciani/pog/main.tar.gz"; # note, you'll probably want to grab a commit sha for this instead of `main`!
sha256 = ""; # this is necessary, but you can find it by letting nix try to evaluate this!
# note, you'll probably want to grab a commit sha for this instead of `main`!
url = "https://github.com/jpetrucciani/pog/main.tar.gz";
# this is necessary, but you can find it by letting nix try to evaluate this!
sha256 = "";
}) {};
in
pog.pog {
Expand Down
12 changes: 6 additions & 6 deletions flake.lock

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

46 changes: 29 additions & 17 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
description = "pog";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
};

outputs = { nixpkgs, flake-utils, ... }:
flake-utils.lib.eachDefaultSystem (system:
let
let
setup = system: rec {
pkgs = nixpkgs.legacyPackages.${system};
pog = import ./. {
inherit pkgs system;
Expand All @@ -17,21 +17,33 @@
inherit (pog) _ pog;
};
builtin = import ./builtin params;
in
rec {
overlays.default = final: prev: { inherit pog; };
packages = { inherit pog builtin; };
defaultPackage = packages.pog;
};
in
flake-utils.lib.eachDefaultSystem
(system:
let
inherit (setup system) pkgs pog builtin;
in
rec {
packages = { inherit pog builtin; };
defaultPackage = packages.pog;

devShells = {
default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [
bun
deadnix
nixpkgs-fmt
statix
];
devShells = {
default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [
bun
deadnix
nixpkgs-fmt
statix
];
};
};
};
})
// flake-utils.lib.eachDefaultSystemPassThrough (system:
let
inherit (setup system) pkgs pog builtin;
in
{
overlays.default = final: prev: { inherit pog; };
});
}

0 comments on commit ff716ad

Please sign in to comment.