Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for static nix-tools #2157

Merged
merged 101 commits into from
Apr 3, 2024
+887 −98,986
Merged

Add support for static nix-tools #2157

Changes from 1 commit
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
26b5169
done
zeme-wana Feb 5, 2024
ca698a5
Add support for static build of nix-tools
zeme-wana Feb 5, 2024
e1bbaf2
Remove CHaP
zeme-wana Feb 7, 2024
1eb67fa
Applied requested changes
zeme-wana Feb 7, 2024
3c8a97a
Remove dependency on iohkNix
zeme-wana Feb 7, 2024
e7ca252
cleanup
zeme-wana Feb 8, 2024
88c64be
Disable tests
zeme-wana Feb 8, 2024
1abaf53
Tried recursive nix
zeme-wana Feb 12, 2024
fba2013
Add haskellNix to nix tools
zeme-wana Feb 13, 2024
4412811
Fix syntax error
zeme-wana Feb 13, 2024
3013491
Fix syntax error
zeme-wana Feb 13, 2024
3c7628c
WIP
zeme-wana Feb 15, 2024
17f7472
added recursive-nix to no-ifd
zeme-wana Feb 20, 2024
9070960
debugging
zeme-wana Feb 20, 2024
4f9c628
Updated haskell.nix
zeme-wana Feb 20, 2024
a4798eb
Merge remote-tracking branch 'origin/master' into static-nix-tools
hamishmack Mar 20, 2024
554b2cc
ifdLevel 0
hamishmack Mar 20, 2024
1452eca
ifdLevel 1
hamishmack Mar 20, 2024
76d2dde
ifdLevel 2
hamishmack Mar 20, 2024
9d6a75f
ifdLevel 3
hamishmack Mar 20, 2024
d0d9211
Bump haskell.nix in nix-tools
hamishmack Mar 20, 2024
82c72c6
ifdLevel 0
hamishmack Mar 20, 2024
692bfd3
ifdLevel 1
hamishmack Mar 20, 2024
ff79418
ifdLevel 2
hamishmack Mar 20, 2024
642d10a
ifdLevel 3
hamishmack Mar 20, 2024
5a7a11a
Add upload-artifacts action
hamishmack Mar 22, 2024
06f23c8
Update url
hamishmack Mar 22, 2024
0f3a84b
Update nix-tools-static.nix in current branch
hamishmack Mar 22, 2024
e6265ae
Add nix-tools hydra job
hamishmack Mar 22, 2024
b6c763d
Fix aggregate job
hamishmack Mar 23, 2024
1c1908d
Fix github action hydra job names
hamishmack Mar 24, 2024
854fddf
Fix github action hydra job names
hamishmack Mar 24, 2024
d852c49
Use github.ref_name for checkout
hamishmack Mar 25, 2024
cfff31b
Hard code branch name
hamishmack Mar 25, 2024
e91ff95
update nix-tools-static.nix
Mar 25, 2024
135704b
Use haskell.nix/nix-tools-static.nix instead of haskell-nix-example/nix
hamishmack Mar 25, 2024
7a920ad
Use haskell.nix/nix-tools-static.nix instead of haskell-nix-example/nix
hamishmack Mar 25, 2024
f46f539
Merge remote-tracking branch 'origin/master' into static-nix-tools
hamishmack Mar 27, 2024
8cc94cf
Support cabal-install 3.10.3
hamishmack Mar 27, 2024
d5b219a
Remove cabal-install materialized files
hamishmack Mar 27, 2024
3474800
Use nix-tools static cabal act-as-setup for default setup
hamishmack Mar 27, 2024
39bcb0a
ifdLevel 0
hamishmack Mar 27, 2024
b280fad
Use nix-tools static cabal act-as-setup for default setup
hamishmack Mar 27, 2024
d6393da
Use nix-tools static cabal act-as-setup for default setup
hamishmack Mar 27, 2024
7a6e85f
update haskell.nix pin in nix-tools/flake.lock
hamishmack Mar 27, 2024
a52568b
ifdLevel 1
hamishmack Mar 27, 2024
f57e112
Bump ghc git commits
hamishmack Mar 27, 2024
406bf87
Bump ghc git commits
hamishmack Mar 27, 2024
a8143b1
ifdLevel 1
hamishmack Mar 27, 2024
a99c1fe
Update version
hamishmack Mar 27, 2024
86683bf
ifdLevel 0
hamishmack Mar 27, 2024
98880e9
ifdLevel 1
hamishmack Mar 28, 2024
436b5fa
ifdLevel 2
hamishmack Mar 28, 2024
383a172
ifdLevel 3
hamishmack Mar 28, 2024
ba55562
Skip plugin test for latest ghc
hamishmack Mar 28, 2024
02ce8ab
Fix debug builds
hamishmack Mar 28, 2024
b8b825d
Put the old default setup back for ghcjs
hamishmack Mar 28, 2024
23500d3
Fix coverage
hamishmack Mar 28, 2024
daf490b
Fix cabal-latest test
hamishmack Mar 28, 2024
28ee00b
Put the old default setup back for ghcjs
hamishmack Mar 28, 2024
718411d
Don't use head.hackage for ghc 9.8
hamishmack Mar 28, 2024
645cea7
Put the old default setup back for ghcjs
hamishmack Mar 28, 2024
92de6c6
ifdLevel 1
hamishmack Mar 29, 2024
fd95990
Fix source-repository-package string context
hamishmack Mar 29, 2024
5951901
ifdLevel 2
hamishmack Mar 29, 2024
02d8284
Merge remote-tracking branch 'origin/master' into static-nix-tools
hamishmack Mar 29, 2024
2012142
ifdLevel 3
hamishmack Mar 29, 2024
a523c85
Fixes for nix-tools builds
hamishmack Mar 29, 2024
0cd4f14
Add missing .
hamishmack Mar 29, 2024
8d6586b
ifdLevel 1
hamishmack Mar 29, 2024
eb671ae
ifdLevel 2
hamishmack Mar 29, 2024
30d4ff1
ifdLevel 3
hamishmack Mar 29, 2024
486984a
Fix for unit tests
hamishmack Mar 29, 2024
cd106c4
Fix default setup for ghcjs
hamishmack Mar 29, 2024
a06c1c0
act-as-setup breaks ghc plugin support somehow
hamishmack Mar 29, 2024
2de1bbe
Fix lint
hamishmack Mar 29, 2024
9bd0c38
Add default setup back into roots
hamishmack Mar 30, 2024
6b04f97
ifdLevel 2
hamishmack Mar 30, 2024
bf9dd09
ifdLevel 3
hamishmack Mar 30, 2024
ec53e92
Merge remote-tracking branch 'origin/master' into static-nix-tools
hamishmack Mar 31, 2024
44dc6f5
Add default-setup to nix-tools
hamishmack Apr 1, 2024
53b7e60
Merge remote-tracking branch 'origin/master' into static-nix-tools
hamishmack Apr 1, 2024
8d24fd0
Update nix-tools/flake.lock so hackage matches
hamishmack Apr 1, 2024
8747fd0
Avoid issues with recursive nix
hamishmack Apr 1, 2024
9e6a591
ifdLevel 0
hamishmack Apr 2, 2024
7a86f97
update nix-tools-static.nix
Apr 2, 2024
4958339
Use static default-setup
hamishmack Apr 2, 2024
204b9a3
ifdLevel 1
hamishmack Apr 2, 2024
3f8c7a1
ifdLevel 2
hamishmack Apr 2, 2024
0ca5733
Fix big cabal pkg-config performance issue
hamishmack Apr 2, 2024
e7aac13
ifdLevel 0
hamishmack Apr 2, 2024
9e1b010
ifdLevel 1
hamishmack Apr 2, 2024
39bdf88
ifdLevel 2
hamishmack Apr 2, 2024
f902ca8
Use static default-setup
hamishmack Apr 2, 2024
0ede248
ifdLevel 3
hamishmack Apr 2, 2024
7a1da5b
Fix shellFor
hamishmack Apr 2, 2024
b26345a
Fix for debug builds
hamishmack Apr 2, 2024
c92d86a
Add comment
hamishmack Apr 3, 2024
fd2ec31
Merge remote-tracking branch 'origin/master' into static-nix-tools
hamishmack Apr 3, 2024
1e35521
Merge remote-tracking branch 'origin/master' into static-nix-tools
hamishmack Apr 3, 2024
183c7af
Use nix-tools.exes.cabal when possible
hamishmack Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Loading
Loading status checks…
ifdLevel 2
@hamishmack
hamishmack committed Mar 20, 2024

Verified

This commit was signed with the committer’s verified signature.
hamishmack Hamish Mackenzie
GPG key ID: 538A4CC29D74DADF
Verified
Learn about vigilant mode
commit 76d2ddea229bafa6852b1056ad850d7c0a493916
2 changes: 1 addition & 1 deletion ci.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 'supportedSystems' restricts the set of systems that we will evaluate for. Useful when you're evaluating
# on a machine with e.g. no way to build the Darwin IFDs you need!
{ ifdLevel ? 1
{ ifdLevel ? 2
, checkMaterialization ? false
, system ? builtins.currentSystem
, evalSystem ? builtins.currentSystem or "x86_64-linux"