Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
horizon-platform
Manage
Activity
Members
Labels
Plan
Issues
2
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-platform
Commits
b6c582fd
Commit
b6c582fd
authored
9 months ago
by
Daniel Firth
Browse files
Options
Downloads
Patches
Plain Diff
Clean up flake and add modifiers file
parent
4afe14d6
1 merge request
!191
Cleanup
Pipeline
#6738
passed with stages
in 3 minutes and 2 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
flake.nix
+6
-17
6 additions, 17 deletions
flake.nix
modifiers.nix
+5
-0
5 additions, 0 deletions
modifiers.nix
with
11 additions
and
17 deletions
flake.nix
+
6
−
17
View file @
b6c582fd
...
...
@@ -14,15 +14,8 @@
nixpkgs
.
url
=
"github:nixos/nixpkgs/nixpkgs-unstable"
;
};
outputs
=
inputs
@
{
self
,
flake-parts
,
horizon-advance
,
nixpkgs
,
...
}:
flake-parts
.
lib
.
mkFlake
{
inherit
inputs
;
}
{
outputs
=
inputs
:
inputs
.
flake-parts
.
lib
.
mkFlake
{
inherit
inputs
;
}
{
systems
=
[
"aarch64-darwin"
"aarch64-linux"
...
...
@@ -32,22 +25,18 @@
imports
=
[
inputs
.
horizon-hoogle
.
flakeModule
];
perSystem
=
{
config
,
system
,
...
}:
let
pkgs
=
nixpkgs
.
legacyPackages
.
${
system
};
in
perSystem
=
{
pkgs
,
config
,
system
,
...
}:
with
pkgs
.
lib
;
let
haskellLib
=
pkgs
.
haskell
.
lib
;
modifiers
=
import
./modifiers.nix
{
inherit
pkgs
;
};
overrides
=
composeManyExtensions
[
(
import
./overlay.nix
{
inherit
pkgs
;
f
=
_
:
prev
:
name
:
v
:
if
hasAttr
name
prev
then
warn
"
${
name
}
exists in parent set"
v
else
v
;
})
(
import
./overlay.nix
{
inherit
pkgs
;
f
=
modifiers
;
})
(
import
./configuration/common.nix
{
inherit
pkgs
haskellLib
;
})
(
import
(
./configuration
+
"/
${
system
}
.nix"
)
{
inherit
pkgs
haskellLib
;
})
];
legacyPackages
=
horizon-advance
.
legacyPackages
.
${
system
}
.
extend
overrides
;
legacyPackages
=
inputs
.
horizon-advance
.
legacyPackages
.
${
system
}
.
extend
overrides
;
packages
=
filterAttrs
(
_
:
isDerivation
)
legacyPackages
;
...
...
This diff is collapsed.
Click to expand it.
modifiers.nix
0 → 100644
+
5
−
0
View file @
b6c582fd
{
pkgs
,
...
}:
with
pkgs
.
lib
;
_
:
prev
:
name
:
v
:
if
hasAttr
name
prev
then
warn
"
${
name
}
exists in parent set"
v
else
v
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