Update resolver, add flake with weeder

This commit is contained in:
thomasjm 2024-02-29 21:09:35 -08:00
parent 064edd3b4a
commit 8591aa6c4e
5 changed files with 137 additions and 37 deletions

99
flake.lock Normal file
View File

@ -0,0 +1,99 @@
{
"nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1709126324,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1709251216,
"narHash": "sha256-YIqYA4e1561zvBK2F7h9ilScnBy+0stgLHb3zOzpmOA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1f50575dc92e39cdec74ab832987f41a57de7f68",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgsMaster": {
"locked": {
"lastModified": 1709260429,
"narHash": "sha256-Fgso2L4vl5NDIWBjX03+P8580N1oGxic/iCd11GjfJU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "244ee5631a7a39b0c6bd989cdf9a1326cd3c5819",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"gitignore": "gitignore",
"nixpkgs": "nixpkgs",
"nixpkgsMaster": "nixpkgsMaster"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

29
flake.nix Normal file
View File

@ -0,0 +1,29 @@
{
description = "Sandwich";
inputs.gitignore = {
url = "github:hercules-ci/gitignore.nix";
inputs.nixpkgs.follows = "nixpkgs";
};
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
inputs.nixpkgsMaster.url = "github:NixOS/nixpkgs/master";
inputs.flake-utils.url = "github:numtide/flake-utils";
outputs = { self, gitignore, nixpkgs, nixpkgsMaster, flake-utils }:
flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
let
pkgs = import nixpkgs { inherit system; };
pkgsMaster = import nixpkgsMaster { inherit system; };
in
{
packages = {
inherit (pkgsMaster) node2nix;
inherit (pkgsMaster.haskell.packages.ghc964) weeder;
test = pkgs.writeShellScriptBin "stack-test" ''
export NIX_PATH=nixpkgs=${pkgs.path}
${pkgs.stack}/bin/stack test
'';
};
});
}

View File

@ -1,5 +1,5 @@
resolver: nightly-2023-11-17
resolver: lts-22.12
ghc-options:
"$locals": >-
@ -50,10 +50,6 @@ packages:
- ./demos/demo-webdriver-video
extra-deps:
- brick-2.1.1
- vty-6.1
- vty-crossplatform-0.4.0.0
- vty-unix-0.2.0.0
- vty-windows-0.2.0.0
# For sandwich-contexts

View File

@ -4,34 +4,6 @@
# https://docs.haskellstack.org/en/stable/lock_files
packages:
- completed:
hackage: brick-2.1.1@sha256:ff36d64f1027eac17a14a83de053067413accb58b79e5002dce2a79cb8a3dcb3,17385
pantry-tree:
sha256: c70beaff3ad9126bc2a9a57649ef63becd534b7eb6b015092cb28437fe3f916d
size: 4671
original:
hackage: brick-2.1.1
- completed:
hackage: vty-6.1@sha256:524d124223c02373260ebc409ddd622fbe97cacd1ea0ee98476b5992bddbc4f3,3661
pantry-tree:
sha256: 4ed3b229066617a0f3429b7b7dadc8e01d14111ac675801053cd35fbb6ee3f14
size: 2104
original:
hackage: vty-6.1
- completed:
hackage: vty-crossplatform-0.4.0.0@sha256:50593f91ad16777d921138475a8d2784d538fd206addd30664c620278d6c8544,3172
pantry-tree:
sha256: ff010cf0ab3f48c43432268a00113e051599285d6ed60cfada7f53e44dbe00f8
size: 582
original:
hackage: vty-crossplatform-0.4.0.0
- completed:
hackage: vty-unix-0.2.0.0@sha256:2af3d0bdae3c4b7b7e567ee374efe32c7439fabdf9096465ce011a6c6736e9ae,2932
pantry-tree:
sha256: 0e3dd52406c263fd4b54d03123e71423d1ef6939fb8c179745486243c519fdf7
size: 1926
original:
hackage: vty-unix-0.2.0.0
- completed:
hackage: vty-windows-0.2.0.0@sha256:91a11bab7bb79f8ee0d4a8166824ed855251cbac101eed3fdf607ad519a13557,2815
pantry-tree:
@ -52,7 +24,7 @@ packages:
git: https://github.com/codedownio/minio-hs
snapshots:
- completed:
sha256: c2e1f24aaacdb9b102211cc79a46de9e906be677d9702ac3aa102bfb8e1fb1c9
size: 698982
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/11/17.yaml
original: nightly-2023-11-17
sha256: e2c529ccfb21501f98f639e056cbde50470b86256d9849d7a82d414ca23e4276
size: 712898
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/12.yaml
original: lts-22.12

4
weeder.toml Normal file
View File

@ -0,0 +1,4 @@
roots = [
"Main.main"
]
type-class-roots = true