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";
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 = {
url = "github:justinwoo/easy-purescript-nix";
flake = false;
};
};
outputs = { self, nixpkgs, easy-purescript-nix }:
let
outputs = {
self,
nixpkgs,
easy-purescript-nix,
}: let
supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-darwin"]; # "aarch64-linux" not supported
forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
forEachSupportedSystem = f:
nixpkgs.lib.genAttrs supportedSystems (system:
f {
pkgs = import nixpkgs {inherit system;};
});
in
{
in {
devShells = forEachSupportedSystem ({pkgs}: {
default =
let
default = let
easy-ps = import easy-purescript-nix {inherit pkgs;};
in
pkgs.mkShell {
packages = (with pkgs; [ nodejs ]) ++ (with easy-ps; [
packages =
(with pkgs; [nodejs])
++ (with easy-ps; [
purs
spago
purescript-language-server

View file

@ -2,36 +2,38 @@
description = "A Nix-flake-based Rust development environment";
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 = {
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, rust-overlay }:
let
outputs = {
self,
nixpkgs,
rust-overlay,
}: let
overlays = [
rust-overlay.overlays.default
(final: prev: {
rustToolchain =
let
rustToolchain = let
rust = prev.rust-bin;
in
if builtins.pathExists ./rust-toolchain.toml then
rust.fromRustupToolchainFile ./rust-toolchain.toml
else if builtins.pathExists ./rust-toolchain then
rust.fromRustupToolchainFile ./rust-toolchain
else
rust.stable.latest.default;
if builtins.pathExists ./rust-toolchain.toml
then rust.fromRustupToolchainFile ./rust-toolchain.toml
else if builtins.pathExists ./rust-toolchain
then rust.fromRustupToolchainFile ./rust-toolchain
else rust.stable.latest.default;
})
];
supportedSystems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
forEachSupportedSystem = f:
nixpkgs.lib.genAttrs supportedSystems (system:
f {
pkgs = import nixpkgs {inherit overlays system;};
});
in
{
in {
devShells = forEachSupportedSystem ({pkgs}: {
default = pkgs.mkShell {
packages = with pkgs; [