mirror of
https://github.com/malob/prefmanager.git
synced 2024-12-14 11:57:49 +00:00
Update inputs, and move to GHC 8.10.7
This commit is contained in:
parent
812dead59f
commit
ebd055ab11
6 changed files with 20 additions and 23 deletions
24
flake.lock
24
flake.lock
|
@ -2,11 +2,11 @@
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"devshell": {
|
"devshell": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1625086391,
|
"lastModified": 1632436039,
|
||||||
"narHash": "sha256-IpNPv1v8s4L3CoxhwcgZIitGpcrnNgnj09X7TA0QV3k=",
|
"narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "devshell",
|
"repo": "devshell",
|
||||||
"rev": "4b5ac7cf7d9a1cc60b965bb51b59922f2210cbc7",
|
"rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -18,11 +18,11 @@
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1606424373,
|
"lastModified": 1627913399,
|
||||||
"narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=",
|
"narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
|
||||||
"owner": "edolstra",
|
"owner": "edolstra",
|
||||||
"repo": "flake-compat",
|
"repo": "flake-compat",
|
||||||
"rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf",
|
"rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -33,11 +33,11 @@
|
||||||
},
|
},
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1623875721,
|
"lastModified": 1631561581,
|
||||||
"narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
|
"narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
|
"rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -48,11 +48,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1626087906,
|
"lastModified": 1633329294,
|
||||||
"narHash": "sha256-n6jPX5j5yEsM5GGnMOmD2syZnoYfVONW/LztPsKu5Uc=",
|
"narHash": "sha256-0LpQLS4KMgxslMgmDHmxG/5twFlXDBW9z4Or1iOrCvU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "eaff114326e814083bcb208caa97eab1fbedd79b",
|
"rev": "ee084c02040e864eeeb4cf4f8538d92f7c675671",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
outputs = { self, devshell, nixpkgs, flake-utils, plist-source, ... }:
|
outputs = { self, devshell, nixpkgs, flake-utils, plist-source, ... }:
|
||||||
flake-utils.lib.eachSystem [ "x86_64-darwin" ] (system: let
|
flake-utils.lib.eachSystem [ "x86_64-darwin" ] (system: let
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
compiler = pkgs.haskell.packages.ghc8104;
|
compiler = pkgs.haskell.packages.ghc8107;
|
||||||
hlib = pkgs.haskell.lib;
|
hlib = pkgs.haskell.lib;
|
||||||
plist = hlib.markUnbroken (hlib.overrideSrc compiler.plist { src = plist-source; });
|
plist = hlib.markUnbroken (hlib.overrideSrc compiler.plist { src = plist-source; });
|
||||||
prefmanager = compiler.callCabal2nix "prefmanager" ./. { inherit plist; };
|
prefmanager = compiler.callCabal2nix "prefmanager" ./. { inherit plist; };
|
||||||
|
|
3
hie.yaml
3
hie.yaml
|
@ -11,6 +11,3 @@ cradle:
|
||||||
|
|
||||||
- path: "./test"
|
- path: "./test"
|
||||||
component: "prefmanager:test:prefmanager-test"
|
component: "prefmanager:test:prefmanager-test"
|
||||||
|
|
||||||
- path: "./property-list-0.1.0.5/src"
|
|
||||||
component: "property-list:lib"
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
with import (import ./default.nix).inputs.nixpkgs {};
|
with import (import ./default.nix).inputs.nixpkgs {};
|
||||||
haskell.lib.buildStackProject {
|
haskell.lib.buildStackProject {
|
||||||
ghc = haskell.compiler.ghc8104;
|
ghc = haskell.compiler.ghc8107;
|
||||||
name = "prefmanager";
|
name = "prefmanager";
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# GHC 8.10.4
|
# GHC 8.10.7
|
||||||
resolver: lts-17.7
|
resolver: lts-18.12
|
||||||
|
|
||||||
packages:
|
packages:
|
||||||
- .
|
- .
|
||||||
|
|
|
@ -31,7 +31,7 @@ packages:
|
||||||
url: https://github.com/malob/plist/archive/5e22be0933bf9a100868b944fa7a8b1236b99255.tar.gz
|
url: https://github.com/malob/plist/archive/5e22be0933bf9a100868b944fa7a8b1236b99255.tar.gz
|
||||||
snapshots:
|
snapshots:
|
||||||
- completed:
|
- completed:
|
||||||
size: 565715
|
size: 586041
|
||||||
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/7.yaml
|
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/12.yaml
|
||||||
sha256: 1b5e4124989399e60e7a7901f0cefd910beea546131fb07a13a7208c4cc8b7ee
|
sha256: 80fc6391195ff00c36f2a605ecbb07de909bfaa2eaa9722a27e486a6ecf8ecb0
|
||||||
original: lts-17.7
|
original: lts-18.12
|
||||||
|
|
Loading…
Reference in a new issue