circuithub/rel8
1
1
Fork 0
mirror of https://github.com/circuithub/rel8.git synced 2024-09-11 16:05:41 +03:00
Code Issues Projects Releases Wiki Activity

Upgrade flake inputs (#278)

Browse Source
This commit is contained in:
Shane 2023-09-29 12:23:22 +01:00 committed by GitHub
parent 0ebb70f95f
commit d058b6467b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 92 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
flake.lock
View File

@ -105,11 +105,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
@ -118,22 +118,6 @@
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1679360468,
"narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=",
"owner": "hamishmack",
"repo": "flake-utils",
"rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5",
"type": "github"
},
"original": {
"owner": "hamishmack",
"ref": "hkm/nested-hydraJobs",
"repo": "flake-utils",
"type": "github"
}
},
"ghc-8.6.5-iohk": {
"flake": false,
"locked": {
@ -151,14 +135,51 @@
"type": "github"
}
},
"ghc980": {
"flake": false,
"locked": {
"lastModified": 1692910316,
"narHash": "sha256-Qv8I3GzzIIN32RTEKI38BW5nO1f7j6Xm+dDeDUyYZWo=",
"ref": "ghc-9.8",
"rev": "249aa8193e4c5c1ee46ce29b39d2fffa57de7904",
"revCount": 61566,
"submodules": true,
"type": "git",
"url": "https://gitlab.haskell.org/ghc/ghc"
},
"original": {
"ref": "ghc-9.8",
"submodules": true,
"type": "git",
"url": "https://gitlab.haskell.org/ghc/ghc"
}
},
"ghc99": {
"flake": false,
"locked": {
"lastModified": 1695427505,
"narHash": "sha256-j0hXl6uEI+Uwf37z3WLuQZN4S0XqGtiepELv2Gl2aHU=",
"ref": "refs/heads/master",
"rev": "b8e4fe2318798185228fb5f8214ba2384ac95b4f",
"revCount": 61951,
"submodules": true,
"type": "git",
"url": "https://gitlab.haskell.org/ghc/ghc"
},
"original": {
"submodules": true,
"type": "git",
"url": "https://gitlab.haskell.org/ghc/ghc"
}
},
"hackage": {
"flake": false,
"locked": {
"lastModified": 1689035195,
"narHash": "sha256-7riFea4N1ubgzTStbS6Cgx/rDDyHC2e+6IPfqwEtWpM=",
"lastModified": 1695946985,
"narHash": "sha256-lWQTPzLmvUtShtFq/fMwguHZO4NjFElNVUoxm/+MG34=",
"owner": "input-output-hk",
"repo": "hackage.nix",
"rev": "85426e6329d6b163d17bd615315c2a24ba469e59",
"rev": "1906e1fda3b25a27b7113a70667aec6477495f5f",
"type": "github"
},
"original": {
@ -175,11 +196,13 @@
"cabal-36": "cabal-36",
"cardano-shell": "cardano-shell",
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_2",
"ghc-8.6.5-iohk": "ghc-8.6.5-iohk",
"ghc980": "ghc980",
"ghc99": "ghc99",
"hackage": "hackage",
"hls-1.10": "hls-1.10",
"hls-2.0": "hls-2.0",
"hls-2.2": "hls-2.2",
"hpc-coveralls": "hpc-coveralls",
"hydra": "hydra",
"iserv-proxy": "iserv-proxy",
@ -198,11 +221,11 @@
"stackage": "stackage"
},
"locked": {
"lastModified": 1689036680,
"narHash": "sha256-VdKBo/E7QTFjmzTfz9e4XPspTjE7EHoQSInAIXm9PMw=",
"lastModified": 1695948601,
"narHash": "sha256-YYk4o0AqJeWsO7WWFYeR67k3Nq+JwP3GvkMVJ3poZzs=",
"owner": "input-output-hk",
"repo": "haskell.nix",
"rev": "c9a78e1d2ce5b0b9b753d12a0175534f98dee485",
"rev": "e49a53445e13bd006c9018ce5d44cf8a7a6487bc",
"type": "github"
},
"original": {
@ -245,6 +268,23 @@
"type": "github"
}
},
"hls-2.2": {
"flake": false,
"locked": {
"lastModified": 1693064058,
"narHash": "sha256-8DGIyz5GjuCFmohY6Fa79hHA/p1iIqubfJUTGQElbNk=",
"owner": "haskell",
"repo": "haskell-language-server",
"rev": "b30f4b6cf5822f3112c35d14a0cba51f3fe23b85",
"type": "github"
},
"original": {
"owner": "haskell",
"ref": "2.2.0.0",
"repo": "haskell-language-server",
"type": "github"
}
},
"hpc-coveralls": {
"flake": false,
"locked": {
@ -287,11 +327,11 @@
"iserv-proxy": {
"flake": false,
"locked": {
"lastModified": 1670983692,
"narHash": "sha256-avLo34JnI9HNyOuauK5R69usJm+GfW3MlyGlYxZhTgY=",
"lastModified": 1691634696,
"narHash": "sha256-MZH2NznKC/gbgBu8NgIibtSUZeJ00HTLJ0PlWKCBHb0=",
"ref": "hkm/remote-iserv",
"rev": "50d0abb3317ac439a4e7495b185a64af9b7b9300",
"revCount": 10,
"rev": "43a979272d9addc29fbffc2e8542c5d96e993d73",
"revCount": 14,
"type": "git",
"url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git"
},
@ -404,11 +444,11 @@
},
"nixpkgs-2205": {
"locked": {
"lastModified": 1682600000,
"narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=",
"lastModified": 1685573264,
"narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0",
"rev": "380be19fbd2d9079f677978361792cb25e8a3635",
"type": "github"
},
"original": {
@ -420,11 +460,11 @@
},
"nixpkgs-2211": {
"locked": {
"lastModified": 1685314633,
"narHash": "sha256-8LXBPqTQXl5ofkjpJ18JcbmLJ/lWDoMxtUwiDYv0wro=",
"lastModified": 1688392541,
"narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c8a17ce7abc03c50cd072e9e6c9b389c5f61836b",
"rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
"type": "github"
},
"original": {
@ -436,11 +476,11 @@
},
"nixpkgs-2305": {
"locked": {
"lastModified": 1685338297,
"narHash": "sha256-+Aq4O0Jn1W1q927ZHc3Zn6RO7bwQGmb6O8xYoGy0KrM=",
"lastModified": 1695416179,
"narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6287b47dbfabbb8bfbb9b1b53d198ad58a774de4",
"rev": "715d72e967ec1dd5ecc71290ee072bcaf5181ed6",
"type": "github"
},
"original": {
@ -468,11 +508,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1685347552,
"narHash": "sha256-9woSppRyUFo26yUffORTzttJ+apOt8MmCv6RxpPNTU4=",
"lastModified": 1695318763,
"narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f2f1ec390714d303cf84ba086e34e45b450dd8c4",
"rev": "e12483116b3b51a185a33a272bf351e357ba9a99",
"type": "github"
},
"original": {
@ -512,11 +552,11 @@
"stackage": {
"flake": false,
"locked": {
"lastModified": 1689034277,
"narHash": "sha256-Ido3tEL8bQKsHFlZa5X8lv+RW8ntplVV1Dcmdt5z3ww=",
"lastModified": 1695859746,
"narHash": "sha256-i36APTMy5SOQ83uhriYH9z4p2t8SvC7JuyPwpGmXFqQ=",
"owner": "input-output-hk",
"repo": "stackage.nix",
"rev": "7a999b71591f8d357d7c838d38ad787d171f3b1f",
"rev": "291606f6b669a9441faf533acd43e0a34957749f",
"type": "github"
},
"original": {

2
flake.nix
View File

@ -28,7 +28,7 @@
};
rel8 = pkgs.haskell-nix.project {
compiler-nix-name = "ghc945";
compiler-nix-name = "ghc962";
cabalProjectLocal = builtins.readFile ./cabal.project.haskell-nix;

5
rel8.cabal
View File

@ -21,7 +21,8 @@ library
build-depends:
aeson
, attoparsec
, base ^>= 4.14 || ^>=4.15 || ^>=4.16 || ^>=4.17
, attoparsec-aeson
, base ^>= 4.14 || ^>=4.15 || ^>=4.16 || ^>=4.17 || ^>=4.18
, base16 >= 1.0
, base-compat ^>= 0.11 || ^>= 0.12 || ^>= 0.13
, bifunctors
@ -240,7 +241,7 @@ test-suite tests
, data-dword
, hasql
, hasql-transaction
, hedgehog ^>= 1.0 || ^>= 1.1
, hedgehog ^>= 1.0 || ^>= 1.1 || ^>= 1.2 || ^>= 1.3 || ^>= 1.4
, mmorph
, network-ip
, rel8

4
src/Rel8/Type.hs
View File

@ -15,11 +15,13 @@ where
-- aeson
import Data.Aeson ( Value )
import qualified Data.Aeson as Aeson
import qualified Data.Aeson.Parser as Aeson
-- attoparsec
import qualified Data.Attoparsec.ByteString.Char8 as A
-- attoparsec-aeson
import qualified Data.Aeson.Parser as Aeson
-- base
import Control.Applicative ((<|>))
import Data.Int ( Int16, Int32, Int64 )