darkkirb/matrix-media-expanded
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update nixpkgs

Browse source
This commit is contained in:
Sridhar Ratnakumar 2022-03-25 14:27:56 -04:00
parent 03ad41b801
commit e4babff826
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.lock generated
View file

@ -70,17 +70,17 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1647893727, "lastModified": 1648097358,
"narHash": "sha256-pOi7VdCb+s5Cwh5CS7YEZVRgH9uCmE87J5W7iXv29Ck=", "narHash": "sha256-GMoTKP/po2Nbkh1tvPvP8Ww6NyFW8FFst1Z3nfzffZc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1ec61dd4167f04be8d05c45780818826132eea0d", "rev": "4d60081494259c0785f7e228518fee74e0792c1b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1ec61dd4167f04be8d05c45780818826132eea0d", "rev": "4d60081494259c0785f7e228518fee74e0792c1b",
"type": "github" "type": "github"
} }
}, },

8
flake.nix
View file

@ -2,7 +2,7 @@
description = "haskell-template's description"; description = "haskell-template's description";
inputs = { inputs = {
# To find a suitable nixpkgs hash with cache, pick one from https://status.nixos.org/ # To find a suitable nixpkgs hash with cache, pick one from https://status.nixos.org/
nixpkgs.url = "github:nixos/nixpkgs/1ec61dd4167f04be8d05c45780818826132eea0d"; nixpkgs.url = "github:nixos/nixpkgs/4d60081494259c0785f7e228518fee74e0792c1b";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
flake-utils.inputs.nixpkgs.follows = "nixpkgs"; flake-utils.inputs.nixpkgs.follows = "nixpkgs";
flake-compat.url = "github:edolstra/flake-compat"; flake-compat.url = "github:edolstra/flake-compat";
@ -25,6 +25,7 @@
# Change GHC version here. To get the appropriate value, run: # Change GHC version here. To get the appropriate value, run:
# nix-env -f "<nixpkgs>" -qaP -A haskell.compiler # nix-env -f "<nixpkgs>" -qaP -A haskell.compiler
hp = pkgs.haskellPackages; # pkgs.haskell.packages.ghc921; hp = pkgs.haskellPackages; # pkgs.haskell.packages.ghc921;
haskellFormatter = "fourmoluStandardGhc8107"; # The formatter to use from inputs.lint-utils
project = returnShellEnv: project = returnShellEnv:
hp.developPackage { hp.developPackage {
@ -60,12 +61,13 @@
# Used by `nix run ...` # Used by `nix run ...`
apps = { apps = {
format = inputs.lint-utils.apps.${system}.fourmoluStandard8107; # TODO: do cabal and nix as well.
format = inputs.lint-utils.apps.${system}.${haskellFormatter};
}; };
# Used by `nix flake check` # Used by `nix flake check`
checks = { checks = {
format-haskell = inputs.lint-utils.linters.${system}.fourmoluStandardGHC8107; format-haskell = inputs.lint-utils.linters.${system}.${haskellFormatter};
format-cabal = inputs.lint-utils.linters.${system}.cabal; format-cabal = inputs.lint-utils.linters.${system}.cabal;
format-nix = inputs.lint-utils.linters.${system}.nixpkgs-fmt; format-nix = inputs.lint-utils.linters.${system}.nixpkgs-fmt;
}; };