primrose/.files
1
0
Fork 0
mirror of https://codeberg.org/leana8959/.files.git synced 2025-12-06 22:59:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

devShells/flora: update ghc to 9.10

Browse source
This commit is contained in:
Primrose 2025-06-02 19:43:01 +02:00
parent 33e5113d90
commit a79628d7e2
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
2 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
nix/devShells/flora.nix
View file

@ -4,7 +4,7 @@
let let
sources = import ../sources.nix; sources = import ../sources.nix;
in in
{pkgs ? import sources.nixpkgs-unstable {}}: {pkgs ? import sources.pin-florashell {}}:
pkgs.mkShell (let pkgs.mkShell (let
libs = with pkgs; [ libs = with pkgs; [
zlib zlib
@ -12,25 +12,24 @@ in
libsodium libsodium
]; ];
fourmolu = let hlib = pkgs.haskell.lib;
pkgs = import sources.pin-fourmolu {};
in callHackage = {name, version}:
with pkgs; let let pkg = pkgs.haskell.packages.ghc910.callHackage name version {};
hlib = haskell.lib; in hlib.dontCheck (hlib.doJailbreak pkg);
fourmolu = haskell.packages.ghc910.callHackage "fourmolu" "0.17.0.0" {};
in
hlib.dontCheck (hlib.doJailbreak fourmolu);
in { in {
name = "flora"; name = "flora";
packages = with pkgs; packages = with pkgs;
[ let
haskellPackages.postgresql-migration haskellPackages = haskell.packages.ghc910;
fourmolu in
haskellPackages.hlint # These don't build directly and need to be pinned
haskellPackages.apply-refact map callHackage [
{name = "fourmolu"; version = "0.17.0.0";}
{name = "postgresql-migration"; version = "0.2.1.8";}
]
++ [
haskellPackages.ghcid haskellPackages.ghcid
haskellPackages.ghc-tags
haskellPackages.cabal-fmt haskellPackages.cabal-fmt
haskellPackages.cabal-install haskellPackages.cabal-install
haskellPackages.ghc haskellPackages.ghc

12
nix/sources.json
View file

@ -103,6 +103,18 @@
"url": "https://github.com/NixOS/nixpkgs/archive/7282cb574e0607e65224d33be8241eae7cfe0979.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/7282cb574e0607e65224d33be8241eae7cfe0979.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"pin-florashell": {
"branch": "nixos-25.05",
"description": "Nix Packages collection",
"homepage": null,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7282cb574e0607e65224d33be8241eae7cfe0979",
"sha256": "0klkpy7ah033y3cwj51a0l96lwmkqqvwgfv3kid4z9x5g2rqr0l5",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/7282cb574e0607e65224d33be8241eae7cfe0979.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs-unstable": { "nixpkgs-unstable": {
"branch": "nixos-unstable", "branch": "nixos-unstable",
"description": "Nix Packages collection & NixOS", "description": "Nix Packages collection & NixOS",