srid/ema
1
1
Fork 0
mirror of https://github.com/srid/ema.git synced 2024-11-29 09:25:14 +03:00
Code Issues Projects Releases Wiki Activity

Update nixpkgs, etc.

Browse Source
This commit is contained in:
Sridhar Ratnakumar 2022-03-17 13:26:18 -04:00
parent f4b4250054
commit 8c9d472b22
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.vscode/settings.json vendored
View File

@ -1,10 +1,5 @@
{
"editor.formatOnType": true,
"editor.formatOnSave": true,
"nixEnvSelector.nixFile": "${workspaceRoot}/shell.nix",
"workbench.colorCustomizations": {
"activityBar.background": "#1A322B",
"titleBar.activeBackground": "#24463C",
"titleBar.activeForeground": "#F7FBFA"
}
"nixEnvSelector.nixFile": "${workspaceRoot}/shell.nix"
}

8
flake.lock
View File

@ -48,17 +48,17 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1646470760,
"narHash": "sha256-dQISyucVCCPaFioUhy5ZgfBz8rOMKGI8k13aPDFTqEs=",
"lastModified": 1647350163,
"narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1fc7212a2c3992eedc6eedf498955c321ad81cc2",
"rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1fc7212a2c3992eedc6eedf498955c321ad81cc2",
"rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d",
"type": "github"
}
},

12
flake.nix
View File

@ -1,7 +1,7 @@
{
description = "Ema project";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/1fc7212a2c3992eedc6eedf498955c321ad81cc2";
nixpkgs.url = "github:nixos/nixpkgs/3eb07eeafb52bcbf02ce800f032f18d666a9498d";
flake-utils.url = "github:numtide/flake-utils";
flake-utils.inputs.nixpkgs.follows = "nixpkgs";
flake-compat = {
@ -14,10 +14,7 @@
flake-utils.lib.eachDefaultSystem (system:
let
name = "ema";
overlays = [ ];
pkgs = import nixpkgs {
inherit system overlays;
};
pkgs = nixpkgs.legacyPackages.${system};
emaProject = returnShellEnv:
pkgs.haskellPackages.developPackage {
inherit name returnShellEnv;
@ -29,7 +26,7 @@
};
modifier = drv:
pkgs.haskell.lib.addBuildTools drv
(with pkgs.haskellPackages; [
(with pkgs.haskellPackages; pkgs.lib.lists.optionals returnShellEnv [
# Specify your build/dev dependencies here.
cabal-fmt
cabal-install
@ -39,11 +36,10 @@
pkgs.nixpkgs-fmt
]);
};
ema = emaProject false;
in
rec {
# Used by `nix build`
defaultPackage = ema;
defaultPackage = emaProject false;
checks = {
pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {