Skip to content
Snippets Groups Projects
Commit a36e3e16 authored by Daniel Firth's avatar Daniel Firth
Browse files

Merge branch 'ghc-96-flake-update' into 'lts/ghc-9.6.x'

nix flake update

See merge request !27
parents d508485f ebf0cd29
Branches
1 merge request!27nix flake update
......@@ -8,6 +8,7 @@ final: prev: {
persistent-qq = null;
/*
sdl2-gfx = addSetupDepends
(overrideCabal prev.sdl2-gfx
{ __onlyPropagateKnownPkgConfigModules = true; }
......@@ -34,6 +35,15 @@ final: prev: {
{ __onlyPropagateKnownPkgConfigModules = true; }
)
[ pkgs.pkg-config pkgs.SDL2 pkgs.SDL2_ttf pkgs.harfbuzz pkgs.freetype pkgs.glib pkgs.pcre2 ];
*/
sdl2-gfx = null;
sdl2-image = null;
sdl2-mixer = null;
sdl2-ttf = null;
zlib = prev.callPackage ./pkgs/zlib.nix { inherit (pkgs) zlib; };
}
......
......@@ -73,11 +73,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1697649528,
"narHash": "sha256-rMnpJHwBnjehuBXbXznGYkoTj45+alsWr1N1TUh4KuM=",
"lastModified": 1699118179,
"narHash": "sha256-gLf8NCNd+FbyiiUgZ2CmmuEB0THXlQPVG23UnMccyWc=",
"ref": "lts/ghc-9.6.x",
"rev": "2d8f63361c460c23516ffdbf30170f510d264b64",
"revCount": 1173,
"rev": "43ec27a8b6a703c8228f42c0421275900a0592fa",
"revCount": 1175,
"type": "git",
"url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core"
},
......@@ -193,11 +193,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1697456312,
"narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
"lastModified": 1698924604,
"narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
"rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40",
"type": "github"
},
"original": {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment