Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
ghcs-nix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cydparser
ghcs-nix
Compare revisions
master to flakify
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
cydparser/ghcs-nix
Select target project
No results found
flakify
Select Git revision
Swap
Target
bgamari/ghcs-nix
Select target project
bgamari/ghcs-nix
pepeiborra/ghcs-nix
mpickering/ghcs-nix
jdprice/ghcs-nix
jaro/ghcs-nix
duog/ghcs-nix
teo/ghcs-nix
cydparser/ghcs-nix
MangoIV/ghcs-nix
9 results
master
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (1)
Flakify
· d911d769
Ben Gamari
authored
2 years ago
d911d769
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
default.nix
+14
-3
14 additions, 3 deletions
default.nix
flake.lock
+60
-0
60 additions, 0 deletions
flake.lock
flake.nix
+45
-0
45 additions, 0 deletions
flake.nix
with
119 additions
and
3 deletions
default.nix
View file @
d911d769
let
let
sources
=
import
./nix/sources.nix
;
sources
=
import
./nix/sources.nix
;
nixpkgs
=
import
sources
.
nixpkgs
{};
in
in
with
nixpkgs
;
{
pkgs
?
import
sources
.
nixpkgs
{},
ghc-master
?
sources
.
ghc-master
}:
with
pkgs
;
let
let
artefacts
=
import
"
${
sources
.
ghc-artefact-nix
.
outPath
}
/releases.nix"
{
baseNixpkgs
=
pkgs
;
};
artefacts
=
import
"
${
sources
.
ghc-artefact-nix
.
outPath
}
/releases.nix"
{
baseNixpkgs
=
pkgs
;
};
...
@@ -612,7 +618,12 @@ let
...
@@ -612,7 +618,12 @@ let
in
in
{
{
inherit
nixpkgs
join
cabal-install
ghcs
ghcs_make
ghcs_hadrian
sources
;
inherit
pkgs
join
cabal-install
ghcs
ghcs_make
ghcs_hadrian
sources
;
# Things needed by flake.nix
lib
=
{
inherit
mapNames
underscoredVersion
;
};
# derivations to be built by CI
# derivations to be built by CI
ciDrvs
=
attrs
;
ciDrvs
=
attrs
;
...
...
This diff is collapsed.
Click to expand it.
flake.lock
0 → 100644
View file @
d911d769
{
"nodes": {
"flake-utils": {
"locked": {
"lastModified": 1678901627,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"ghc-master": {
"flake": false,
"locked": {
"lastModified": 1679411953,
"narHash": "sha256-dQxVYqgtUKulEU75WTFfopivmaGz+3Cvn9JOI8DHIAM=",
"ref": "refs/heads/master",
"rev": "be1d4be8d09072091b77cb68ccf234434754af00",
"revCount": 60956,
"type": "git",
"url": "https://gitlab.haskell.org/ghc/ghc.git"
},
"original": {
"type": "git",
"url": "https://gitlab.haskell.org/ghc/ghc.git"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1659446231,
"narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "eabc38219184cc3e04a974fe31857d8e0eac098d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-21.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"ghc-master": "ghc-master",
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}
This diff is collapsed.
Click to expand it.
flake.nix
0 → 100644
View file @
d911d769
{
inputs
.
nixpkgs
.
url
=
"github:nixos/nixpkgs/nixos-21.11"
;
inputs
.
flake-utils
.
url
=
"github:numtide/flake-utils"
;
inputs
.
ghc-master
=
{
url
=
"git+https://gitlab.haskell.org/ghc/ghc.git"
;
flake
=
false
;
};
outputs
=
inputs
@
{
self
,
nixpkgs
,
flake-utils
,
...
}:
flake-utils
.
lib
.
eachDefaultSystem
(
system
:
let
pkgs
=
nixpkgs
.
legacyPackages
.
${
system
};
x
=
import
./default.nix
{
inherit
pkgs
;
inherit
(
inputs
)
ghc-master
;
};
in
{
packages
=
rec
{
ghc
=
x
.
lib
.
mapNames
x
.
lib
.
underscoredVersion
x
.
ghcs
;
ghc-make
=
x
.
ghcs_make
;
ghc-hadrian
=
x
.
ghcs_hadrian
;
cabal-install
=
x
.
cabals
;
};
apps
=
let
inherit
(
pkgs
)
lib
;
inherit
(
flake-utils
.
lib
)
mkApp
;
ghcAttrs
=
lib
.
map
(
drv
:
lib
.
nameValuePair
"ghc-
${
drv
.
version
}
"
(
mkApp
{
inherit
drv
;
exePath
=
"bin/ghc"
;
}))
self
.
${
system
}
.
packages
.
ghc
;
cabalAttrs
=
lib
.
map
(
drv
:
lib
.
nameValuePair
"cabal-install-
${
drv
.
version
}
"
(
mkApp
{
inherit
drv
;
exePath
=
"bin/cabal"
;
}))
self
.
${
system
}
.
packages
.
cabal-install
;
in
lib
.
listToAttrs
(
ghcAttrs
++
cabalAttrs
);
}
);
}
This diff is collapsed.
Click to expand it.