diff --git a/flake.nix b/flake.nix index dad0c52..8fa9a3e 100644 --- a/flake.nix +++ b/flake.nix @@ -93,12 +93,7 @@ }; in { default = pkgs.rWrapper.override {packages = builtins.attrValues pkgs.extraRPackages;}; - franUpdate = pkgs.writeShellScriptBin "fran-update" '' - pg=${pkgs.nix-prefetch-github}/bin/nix-prefetch-github - $pg --json hannesdatta musicMetadata > versions/musicMetadata.json - $pg --json nx10 httpgd > versions/httpgd.json - $pg --json synth-inference synthdid > versions/synthdid.json - ''; + franUpdate = pkgs.writeShellScriptBin "fran-update" (import ./versions pkgs); } ); # Helpful for overlay users: expose a devShell with R including these pkgs @@ -109,16 +104,11 @@ }; in { default = pkgs.mkShell { - packages = [ - self.packages."${system}".default + packages = with self.packages."${system}"; [ + default + franUpdate ]; }; - update = pkgs.mkShell { - packages = [self.packages."${system}".franUpdate]; - shellHook = '' - fran-update - ''; - }; }); }; nixConfig = { diff --git a/versions/default.nix b/versions/default.nix new file mode 100644 index 0000000..9dce168 --- /dev/null +++ b/versions/default.nix @@ -0,0 +1,6 @@ +pkgs: '' + pg=${pkgs.nix-prefetch-github}/bin/nix-prefetch-github + $pg --json hannesdatta musicMetadata > versions/musicMetadata.json + $pg --json nx10 httpgd > versions/httpgd.json + $pg --json synth-inference synthdid > versions/synthdid.json +''