mirror of
https://github.com/aristanetworks/nix-serve-ng.git
synced 2024-10-05 19:17:12 +03:00
Support GHC 9.4 (#32)
Fixes https://github.com/aristanetworks/nix-serve-ng/issues/31
This commit is contained in:
parent
f3931b8120
commit
21e65cb4c6
@ -18,11 +18,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1688403656,
|
"lastModified": 1700856099,
|
||||||
"narHash": "sha256-zmNai3dKWUCKpKubPWsEJ1Q7od96KebWVDJNCnk+fr0=",
|
"narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "453da3c28f7a95374b73d1f3fd665dd40e6049e9",
|
"rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
outputs = { nixpkgs, utils, ... }:
|
outputs = { nixpkgs, utils, ... }:
|
||||||
let
|
let
|
||||||
compiler = "ghc92";
|
compiler = "ghc94";
|
||||||
|
|
||||||
overlay = final: prev: {
|
overlay = final: prev: {
|
||||||
cabal2nix-unwrapped =
|
cabal2nix-unwrapped =
|
||||||
|
@ -162,8 +162,9 @@ data PathInfo = PathInfo
|
|||||||
|
|
||||||
fromCPathInfo :: CPathInfo -> IO PathInfo
|
fromCPathInfo :: CPathInfo -> IO PathInfo
|
||||||
fromCPathInfo CPathInfo{ deriver, narHash, narSize, references, sigs } = do
|
fromCPathInfo CPathInfo{ deriver, narHash, narSize, references, sigs } = do
|
||||||
|
let String_{ data_ } = deriver
|
||||||
deriver_ <-
|
deriver_ <-
|
||||||
if data_ (deriver :: String_) == Foreign.nullPtr
|
if data_ == Foreign.nullPtr
|
||||||
then return Nothing
|
then return Nothing
|
||||||
else fmap Just (fromString_ deriver)
|
else fmap Just (fromString_ deriver)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user