Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
horizon-advance
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
package-sets
horizon-advance
Commits
a36e3e16
Commit
a36e3e16
authored
1 year ago
by
Daniel Firth
Browse files
Options
Downloads
Plain Diff
Merge branch 'ghc-96-flake-update' into 'lts/ghc-9.6.x'
nix flake update See merge request
!27
parents
d508485f
ebf0cd29
Branches
Branches containing commit
1 merge request
!27
nix flake update
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configuration.nix
+10
-0
10 additions, 0 deletions
configuration.nix
flake.lock
+7
-7
7 additions, 7 deletions
flake.lock
with
17 additions
and
7 deletions
configuration.nix
+
10
−
0
View file @
a36e3e16
...
...
@@ -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
;
};
}
...
...
This diff is collapsed.
Click to expand it.
flake.lock
+
7
−
7
View file @
a36e3e16
...
...
@@ -73,11 +73,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 169
7649528
,
"narHash": "sha256-
rMnpJHwBnjehuBXbXznGYkoTj45+alsWr1N1TUh4KuM
=",
"lastModified": 169
9118179
,
"narHash": "sha256-
gLf8NCNd+FbyiiUgZ2CmmuEB0THXlQPVG23UnMccyWc
=",
"ref": "lts/ghc-9.6.x",
"rev": "
2d8f63361c460c23516ffdbf30170f510d264b64
",
"revCount": 117
3
,
"rev": "
43ec27a8b6a703c8228f42c0421275900a0592fa
",
"revCount": 117
5
,
"type": "git",
"url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core"
},
...
...
@@ -193,11 +193,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 169
7456312
,
"narHash": "sha256-
roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo
=",
"lastModified": 169
8924604
,
"narHash": "sha256-
GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0
=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "
ca012a02bf8327be9e488546faecae5e05d7d749
",
"rev": "
fa804edfb7869c9fb230e174182a8a1a7e512c40
",
"type": "github"
},
"original": {
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment