Fix these two templates

This commit is contained in:
Lillian Violet 2024-01-18 13:42:47 +01:00
parent 0ea67a261e
commit 4e96eb7733
2 changed files with 64 additions and 57 deletions

View file

@ -2,28 +2,33 @@
description = "A Nix-flake-based Purescript development environment"; description = "A Nix-flake-based Purescript development environment";
inputs = { inputs = {
inputs.nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz"; nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz";
easy-purescript-nix = { easy-purescript-nix = {
url = "github:justinwoo/easy-purescript-nix"; url = "github:justinwoo/easy-purescript-nix";
flake = false; flake = false;
}; };
}; };
outputs = { self, nixpkgs, easy-purescript-nix }: outputs = {
let self,
supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; # "aarch64-linux" not supported nixpkgs,
forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f { easy-purescript-nix,
pkgs = import nixpkgs { inherit system; }; }: let
supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-darwin"]; # "aarch64-linux" not supported
forEachSupportedSystem = f:
nixpkgs.lib.genAttrs supportedSystems (system:
f {
pkgs = import nixpkgs {inherit system;};
}); });
in in {
{ devShells = forEachSupportedSystem ({pkgs}: {
devShells = forEachSupportedSystem ({ pkgs }: { default = let
default = easy-ps = import easy-purescript-nix {inherit pkgs;};
let
easy-ps = import easy-purescript-nix { inherit pkgs; };
in in
pkgs.mkShell { pkgs.mkShell {
packages = (with pkgs; [ nodejs ]) ++ (with easy-ps; [ packages =
(with pkgs; [nodejs])
++ (with easy-ps; [
purs purs
spago spago
purescript-language-server purescript-language-server

View file

@ -2,37 +2,39 @@
description = "A Nix-flake-based Rust development environment"; description = "A Nix-flake-based Rust development environment";
inputs = { inputs = {
inputs.nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz"; nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz";
rust-overlay = { rust-overlay = {
url = "github:oxalica/rust-overlay"; url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = { self, nixpkgs, rust-overlay }: outputs = {
let self,
nixpkgs,
rust-overlay,
}: let
overlays = [ overlays = [
rust-overlay.overlays.default rust-overlay.overlays.default
(final: prev: { (final: prev: {
rustToolchain = rustToolchain = let
let
rust = prev.rust-bin; rust = prev.rust-bin;
in in
if builtins.pathExists ./rust-toolchain.toml then if builtins.pathExists ./rust-toolchain.toml
rust.fromRustupToolchainFile ./rust-toolchain.toml then rust.fromRustupToolchainFile ./rust-toolchain.toml
else if builtins.pathExists ./rust-toolchain then else if builtins.pathExists ./rust-toolchain
rust.fromRustupToolchainFile ./rust-toolchain then rust.fromRustupToolchainFile ./rust-toolchain
else else rust.stable.latest.default;
rust.stable.latest.default;
}) })
]; ];
supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; supportedSystems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f { forEachSupportedSystem = f:
pkgs = import nixpkgs { inherit overlays system; }; nixpkgs.lib.genAttrs supportedSystems (system:
f {
pkgs = import nixpkgs {inherit overlays system;};
}); });
in in {
{ devShells = forEachSupportedSystem ({pkgs}: {
devShells = forEachSupportedSystem ({ pkgs }: {
default = pkgs.mkShell { default = pkgs.mkShell {
packages = with pkgs; [ packages = with pkgs; [
rustToolchain rustToolchain