Compare commits

...

4 commits

Author SHA1 Message Date
Fiscal Velvet Poet a01de1ee9e
chore(flakeUtils): bumped to HEAD of master 2024-10-18 21:14:04 +10:00
Fiscal Velvet Poet aba3616a16
chore(haskellNix): bumped to HEAD of master 2024-10-18 21:13:44 +10:00
Fiscal Velvet Poet 578a6aa77a
chore(nixos): bumped to HEAD of 24.05 2024-10-18 21:10:02 +10:00
Fiscal Velvet Poet a7c888a2d5
chore(nix): formatted outputs.nix 2024-10-18 21:05:32 +10:00
2 changed files with 152 additions and 99 deletions

View file

@ -117,51 +117,14 @@
"type": "github"
}
},
"ghc910X": {
"flake": false,
"locked": {
"lastModified": 1711543129,
"narHash": "sha256-MUI07CxYOng7ZwHnMCw0ugY3HmWo2p/f4r07CGV7OAM=",
"ref": "ghc-9.10",
"rev": "6ecd5f2ff97af53c7334f2d8581651203a2c6b7d",
"revCount": 62607,
"submodules": true,
"type": "git",
"url": "https://gitlab.haskell.org/ghc/ghc"
},
"original": {
"ref": "ghc-9.10",
"submodules": true,
"type": "git",
"url": "https://gitlab.haskell.org/ghc/ghc"
}
},
"ghc911": {
"flake": false,
"locked": {
"lastModified": 1711538967,
"narHash": "sha256-KSdOJ8seP3g30FaC2du8QjU9vumMnmzPR5wfkVRXQMk=",
"ref": "refs/heads/master",
"rev": "0acfe391583d77a72051d505f05fab0ada056c49",
"revCount": 62632,
"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": 1712795058,
"narHash": "sha256-F1PagSlHDeljaHCscOeVw4x7mgxDFgPF9rukr0twCOU=",
"lastModified": 1723509065,
"narHash": "sha256-cu7ZQjHFmioemNSSWkRixArTYWbGuO/Ljf9VuMIFwik=",
"owner": "input-output-hk",
"repo": "hackage.nix",
"rev": "75f7e75bd6d56d4440fa9357605680ec72d0d125",
"rev": "a14d5468baa4936134b31c064b13eb4fd1403c82",
"type": "github"
},
"original": {
@ -179,8 +142,6 @@
"cardano-shell": "cardano-shell",
"flake-compat": "flake-compat",
"ghc-8.6.5-iohk": "ghc-8.6.5-iohk",
"ghc910X": "ghc910X",
"ghc911": "ghc911",
"hackage": "hackage",
"hls-1.10": "hls-1.10",
"hls-2.0": "hls-2.0",
@ -189,6 +150,9 @@
"hls-2.4": "hls-2.4",
"hls-2.5": "hls-2.5",
"hls-2.6": "hls-2.6",
"hls-2.7": "hls-2.7",
"hls-2.8": "hls-2.8",
"hls-2.9": "hls-2.9",
"hpc-coveralls": "hpc-coveralls",
"hydra": "hydra",
"iserv-proxy": "iserv-proxy",
@ -203,16 +167,17 @@
"nixpkgs-2211": "nixpkgs-2211",
"nixpkgs-2305": "nixpkgs-2305",
"nixpkgs-2311": "nixpkgs-2311",
"nixpkgs-2405": "nixpkgs-2405",
"nixpkgs-unstable": "nixpkgs-unstable",
"old-ghc-nix": "old-ghc-nix",
"stackage": "stackage"
},
"locked": {
"lastModified": 1712796616,
"narHash": "sha256-J+Ph+KHlgNLZdttUQg8/Z7vMcWyAdNte07rIEjbqs0A=",
"lastModified": 1723510247,
"narHash": "sha256-Nwbq/NAn+Vad4SmoSLHHRxQxxXy/I/6inbMCjQpVvBI=",
"owner": "input-output-hk",
"repo": "haskell.nix",
"rev": "ad2a252f02e704ded23d465c00e8219e1d4b6841",
"rev": "374c444d6b78a37b2aa730685a34e0f44ddbd3de",
"type": "github"
},
"original": {
@ -340,6 +305,57 @@
"type": "github"
}
},
"hls-2.7": {
"flake": false,
"locked": {
"lastModified": 1708965829,
"narHash": "sha256-LfJ+TBcBFq/XKoiNI7pc4VoHg4WmuzsFxYJ3Fu+Jf+M=",
"owner": "haskell",
"repo": "haskell-language-server",
"rev": "50322b0a4aefb27adc5ec42f5055aaa8f8e38001",
"type": "github"
},
"original": {
"owner": "haskell",
"ref": "2.7.0.0",
"repo": "haskell-language-server",
"type": "github"
}
},
"hls-2.8": {
"flake": false,
"locked": {
"lastModified": 1715153580,
"narHash": "sha256-Vi/iUt2pWyUJlo9VrYgTcbRviWE0cFO6rmGi9rmALw0=",
"owner": "haskell",
"repo": "haskell-language-server",
"rev": "dd1be1beb16700de59e0d6801957290bcf956a0a",
"type": "github"
},
"original": {
"owner": "haskell",
"ref": "2.8.0.0",
"repo": "haskell-language-server",
"type": "github"
}
},
"hls-2.9": {
"flake": false,
"locked": {
"lastModified": 1718469202,
"narHash": "sha256-THXSz+iwB1yQQsr/PY151+2GvtoJnTIB2pIQ4OzfjD4=",
"owner": "haskell",
"repo": "haskell-language-server",
"rev": "40891bccb235ebacce020b598b083eab9dda80f1",
"type": "github"
},
"original": {
"owner": "haskell",
"ref": "2.9.0.0",
"repo": "haskell-language-server",
"type": "github"
}
},
"hpc-coveralls": {
"flake": false,
"locked": {
@ -382,11 +398,11 @@
"iserv-proxy": {
"flake": false,
"locked": {
"lastModified": 1708894040,
"narHash": "sha256-Rv+PajrnuJ6AeyhtqzMN+bcR8z9+aEnrUass+N951CQ=",
"lastModified": 1717479972,
"narHash": "sha256-7vE3RQycHI1YT9LHJ1/fUaeln2vIpYm6Mmn8FTpYeVo=",
"owner": "stable-haskell",
"repo": "iserv-proxy",
"rev": "2f2a318fd8837f8063a0d91f329aeae29055fba9",
"rev": "2ed34002247213fc435d0062350b91bab920626e",
"type": "github"
},
"original": {
@ -531,11 +547,11 @@
},
"nixpkgs-2305": {
"locked": {
"lastModified": 1701362232,
"narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=",
"lastModified": 1705033721,
"narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d2332963662edffacfddfad59ff4f709dde80ffe",
"rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea",
"type": "github"
},
"original": {
@ -547,11 +563,11 @@
},
"nixpkgs-2311": {
"locked": {
"lastModified": 1701386440,
"narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=",
"lastModified": 1719957072,
"narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "293822e55ec1872f715a66d0eda9e592dc14419f",
"rev": "7144d6241f02d171d25fba3edeaf15e0f2592105",
"type": "github"
},
"original": {
@ -561,6 +577,22 @@
"type": "github"
}
},
"nixpkgs-2405": {
"locked": {
"lastModified": 1720122915,
"narHash": "sha256-Nby8WWxj0elBu1xuRaUcRjPi/rU3xVbkAt2kj4QwX2U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "835cf2d3f37989c5db6585a28de967a667a75fb1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-24.05-darwin",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-regression": {
"locked": {
"lastModified": 1643052045,
@ -579,27 +611,27 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1694822471,
"narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=",
"lastModified": 1720181791,
"narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "47585496bcb13fb72e4a90daeea2f434e2501998",
"rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"rev": "47585496bcb13fb72e4a90daeea2f434e2501998",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1721548954,
"narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=",
"lastModified": 1723400035,
"narHash": "sha256-WoKZDlBEdMhP+hjquBAh0BhUJbcH2+U8g2mHOr1mv8I=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a",
"rev": "a731b45590a5169542990c36ffcde6cebd9a3356",
"type": "github"
},
"original": {
@ -636,11 +668,11 @@
"stackage": {
"flake": false,
"locked": {
"lastModified": 1712794249,
"narHash": "sha256-/7K7QStT2VTQlhvSQqMr7GkU+3IQNtMH5MCfbRbDACE=",
"lastModified": 1723508451,
"narHash": "sha256-hK6l7fwCBcQnKjqwpHMicytlCpQh4bCUeiG/qxsABS0=",
"owner": "input-output-hk",
"repo": "stackage.nix",
"rev": "638d3e6846e1c7c822b5074850abb4e637a6c4ab",
"rev": "5af3e1baf18c7ea8db99c09cc628d3be11ba7b21",
"type": "github"
},
"original": {
@ -649,13 +681,31 @@
"type": "github"
}
},
"utils": {
"systems": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {

View file

@ -1,31 +1,34 @@
{ self, nixpkgs, utils, haskellNix }@ inputs:
utils.lib.eachDefaultSystem (system:
let
overlay = self: _: {
hsPkgs =
self.haskell-nix.project' rec {
src = ./.;
compiler-nix-name = "ghc928";
};
};
pkgs = import nixpkgs {
inherit system;
overlays = [
haskellNix.overlay
overlay
];
};
flake = pkgs.hsPkgs.flake { };
in
{
packages.default = flake.packages."skeleton-web:exe:site";
apps.default = {
type = "app";
program = "${flake.packages."skeleton-web:exe:site"}/bin/site";
};
# Overwrite devShells being inported from haskell-nix
devShells.default = pkgs.callPackage ./shell.nix {
inherit (haskellNix.legacyPackages."${pkgs.system}") stylish-haskell;
};
}
)
{
self,
nixpkgs,
utils,
haskellNix,
} @ inputs:
utils.lib.eachDefaultSystem (
system: let
overlay = self: _: {
hsPkgs = self.haskell-nix.project' rec {
src = ./.;
compiler-nix-name = "ghc944";
};
};
pkgs = import nixpkgs {
inherit system;
overlays = [
haskellNix.overlay
overlay
];
};
flake = pkgs.hsPkgs.flake {};
in {
packages.default = flake.packages."skeleton-web:exe:site";
apps.default = {
type = "app";
program = "${flake.packages."skeleton-web:exe:site"}/bin/site";
};
# Overwrite devShells being inported from haskell-nix
devShells.default = pkgs.callPackage ./shell.nix {
inherit (haskellNix.legacyPackages."${pkgs.system}") stylish-haskell;
};
}
)