Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
horizon-platform
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
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
Théophile Choutri
horizon-platform
Commits
cf954ac9
Commit
cf954ac9
authored
2 years ago
by
Daniel Firth
Browse files
Options
Downloads
Plain Diff
Merge branch 'flake-update' into 'master'
nix flake update See merge request
!16
parents
a033c9df
a88bf64a
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configuration.nix
+4
-0
4 additions, 0 deletions
configuration.nix
flake.lock
+13
-13
13 additions, 13 deletions
flake.lock
with
17 additions
and
13 deletions
configuration.nix
+
4
−
0
View file @
cf954ac9
...
...
@@ -16,6 +16,10 @@ final: prev: {
text-icu
=
prev
.
callPackage
./pkgs/text-icu.nix
{
icu-i18n
=
pkgs
.
icu
;
};
sdl2-image
=
addPkgconfigDepends
prev
.
sdl2-image
[
pkgs
.
libtiff
pkgs
.
libdeflate
pkgs
.
libwebp
];
sdl2-mixer
=
addPkgconfigDepends
prev
.
sdl2-mixer
[
pkgs
.
glib
pkgs
.
pcre2
pkgs
.
libsndfile
pkgs
.
libpulseaudio
pkgs
.
alsa-lib
pkgs
.
jack2
];
X11-xft
=
addPkgconfigDepends
prev
.
X11-xft
[
pkgs
.
expat
pkgs
.
xorg
.
libXau
pkgs
.
xorg
.
libXdmcp
];
zlib
=
prev
.
callPackage
./pkgs/zlib.nix
{
inherit
(
pkgs
)
zlib
;
};
...
...
This diff is collapsed.
Click to expand it.
flake.lock
+
13
−
13
View file @
cf954ac9
...
...
@@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 167
5933616
,
"narHash": "sha256-
/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA
=",
"lastModified": 167
8379998
,
"narHash": "sha256-
TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw
=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "
47478a4a003e745402acf63be7f9a092d51b83d
7",
"rev": "
c13d60b89adea3dc20704c045ec4d50dd964d44
7",
"type": "github"
},
"original": {
...
...
@@ -39,11 +39,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 167
0
62
3736
,
"narHash": "sha256-
CrA/yua5H0NfZ2tu1QZ2WpYi6pkWzyFxiwGk+KoF620
=",
"lastModified": 16762
04115
,
"narHash": "sha256-
cYYt6sN9t+lYYYelAbRtM/ioVJ27kMcUtR4unA8jfd4
=",
"ref": "refs/heads/master",
"rev": "
ee76287dc9987dd01ec38d38839b788a26ee5f24
",
"revCount": 4
5
,
"rev": "
cc55bca9b25e65f7060de642c99e51bd96dfc190
",
"revCount": 4
7
,
"type": "git",
"url": "https://gitlab.homotopic.tech/nix/lint-utils"
},
...
...
@@ -71,11 +71,11 @@
"nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 167
5183161
,
"narHash": "sha256-
Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg
=",
"lastModified": 167
8375444
,
"narHash": "sha256-
XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8
=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "
e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18
e",
"rev": "
130fa0baaa2b93ec45523fdcde942f6844ee9f6
e",
"type": "github"
},
"original": {
...
...
@@ -88,11 +88,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 167
3947312
,
"narHash": "sha256-
xx/2nRwRy3bXrtry6TtydKpJpqHahjuDB5sFkQ/XNDE
=",
"lastModified": 167
9198465
,
"narHash": "sha256-
VfXpHpniNWgg7pBzxb20pRX7kqn80LApPDQYTReiFCw
=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "
2d38b664b4400335086a713a0036aafaa002c003
",
"rev": "
5a05160f7671434e1c833b1b01284b876e04eca4
",
"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