sercanto/mcwhirter.io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'nixos-21.11' into consensus

Browse source
This commit is contained in:
Serĉanto de Scio 2021-12-22 18:33:07 +10:00
commit a53a2f8a8a
Signed by: sercanto
GPG key ID: 7DBA9F5689EFB6AA
4 changed files with 15 additions and 15 deletions

2
.envrc Normal file
View file

@ -0,0 +1,2 @@
use nix
watch_file nix/*

2
mcwhirter-io.cabal
View file

@ -6,7 +6,7 @@ cabal-version: >= 1.10
executable site executable site
main-is: site.hs main-is: site.hs
build-depends: base == 4.* build-depends: base == 4.*
, hakyll == 4.14.* , hakyll == 4.15.*
, pandoc , pandoc
ghc-options: -threaded ghc-options: -threaded
default-language: Haskell2010 default-language: Haskell2010

10
nix/sources.json
View file

@ -12,15 +12,15 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs": { "nixpkgs": {
"branch": "nixpkgs-unstable", "branch": "nixos-21.11",
"description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to", "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
"homepage": "https://github.com/NixOS/nixpkgs", "homepage": "https://github.com/NixOS/nixpkgs",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs-channels", "repo": "nixpkgs",
"rev": "10100a97c8964e82b30f180fda41ade8e6f69e41", "rev": "9ab7d12287ced0e1b4c03b61c781901f178d9d77",
"sha256": "011f36kr3c1ria7rag7px26bh73d1b0xpqadd149bysf4hg17rln", "sha256": "0bbd2pgcyavqn5wgq0xp8p67lha0kv9iqnh49i9w5fb5g29q7i30",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs-channels/archive/10100a97c8964e82b30f180fda41ade8e6f69e41.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/9ab7d12287ced0e1b4c03b61c781901f178d9d77.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
} }
} }

16
release.nix
View file

@ -1,5 +1,5 @@
let sources = import ./nix/sources.nix; let sources = import ./nix/sources.nix;
in { compiler ? "ghc883", pkgs ? import sources.nixpkgs { } }: in { compiler ? "ghc8107", pkgs ? import sources.nixpkgs { } }:
let let
inherit (pkgs.lib.trivial) flip pipe; inherit (pkgs.lib.trivial) flip pipe;
@ -24,14 +24,12 @@ in {
shell = haskellPackages.shellFor { shell = haskellPackages.shellFor {
packages = p: with p; [ project ]; packages = p: with p; [ project ];
#buildInputs = with haskellPackages; [ buildInputs = with haskellPackages; [
# ghcid ghcid
# hlint # or ormolu hlint # or ormolu
# niv pkgs.niv
# pkgs.cacert # needed for niv zlib
# pkgs.nix # needed for niv ];
# zlib
#];
withHoogle = true; withHoogle = true;
}; };
} }