Commit Graph

126 Commits

Author SHA1 Message Date
Yvan Sraka
54ea656103
Fix error: failed to create directory via template '/tmp/nix-shell.XXXXXX/' (#157)
mktemp: failed to create directory via template '/tmp/nix-shell.xsPtzA/nix-shell.XXXXXX': No such file or directory
2024-06-19 10:48:32 +00:00
github-actions[bot]
6ee20d669c
flake.lock: Update (#94)
Flake lock file updates:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384?narHash=sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt%2BxmY%3D' (2023-09-12)
  → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a?narHash=sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ%3D' (2024-03-11)
• Updated input 'haskellNix':
    'github:input-output-hk/haskell.nix/7400a707f2363fcb0dd9f3066672bbbad6976bb9?narHash=sha256-d0syrqLiyhwuOA8dAWHZ0N8NNI51JvhtXySQYt2XvAQ%3D' (2024-04-13)
  → 'github:input-output-hk/haskell.nix/8f50d10aa7ce71f2dcb6c8eb25c2352294ddc854?narHash=sha256-iSGepzdSLyvYafn%2BOvXCGN50ZsWQiGcJIKq4s%2Bsg4nY%3D' (2024-06-08)
• Updated input 'haskellNix/ghc910X':
    'git+https://gitlab.haskell.org/ghc/ghc?ref=ghc-9.10&rev=6ecd5f2ff97af53c7334f2d8581651203a2c6b7d&submodules=1' (2024-03-27)
  → 'git+https://gitlab.haskell.org/ghc/ghc?ref=ghc-9.10&rev=2c6375b9a804ac7fca1e82eb6fcfc8594c67c5f5&submodules=1' (2024-04-30)
• Updated input 'haskellNix/ghc911':
    'git+https://gitlab.haskell.org/ghc/ghc?ref=refs/heads/master&rev=0acfe391583d77a72051d505f05fab0ada056c49&submodules=1' (2024-03-27)
  → 'git+https://gitlab.haskell.org/ghc/ghc?ref=refs/heads/master&rev=fc24c5cf6c62ca9e3c8d236656e139676df65034&submodules=1' (2024-05-04)
• Updated input 'haskellNix/hackage':
    'github:input-output-hk/hackage.nix/c3ab2f880ee6c8af1f51e5e5202e96a29144a953?narHash=sha256-jKx8KJxGHfdmFB2spyj58Na31cknm2RQWvo19vslF6U%3D' (2024-04-13)
  → 'github:input-output-hk/hackage.nix/edb78b8087db9d494ee3eeb9105c7650e44d009f?narHash=sha256-CCqRhadPKQUkB/ncLBGHHt7XT8VbSR532sfpjbPNcZI%3D' (2024-06-08)
• Added input 'haskellNix/hls-2.7':
    'github:haskell/haskell-language-server/50322b0a4aefb27adc5ec42f5055aaa8f8e38001?narHash=sha256-LfJ%2BTBcBFq/XKoiNI7pc4VoHg4WmuzsFxYJ3Fu%2BJf%2BM%3D' (2024-02-26)
• Added input 'haskellNix/hls-2.8':
    'github:haskell/haskell-language-server/dd1be1beb16700de59e0d6801957290bcf956a0a?narHash=sha256-Vi/iUt2pWyUJlo9VrYgTcbRviWE0cFO6rmGi9rmALw0%3D' (2024-05-08)
• Updated input 'haskellNix/iserv-proxy':
    'github:stable-haskell/iserv-proxy/2f2a318fd8837f8063a0d91f329aeae29055fba9?narHash=sha256-Rv%2BPajrnuJ6AeyhtqzMN%2BbcR8z9%2BaEnrUass%2BN951CQ%3D' (2024-02-25)
  → 'github:stable-haskell/iserv-proxy/2ed34002247213fc435d0062350b91bab920626e?narHash=sha256-7vE3RQycHI1YT9LHJ1/fUaeln2vIpYm6Mmn8FTpYeVo%3D' (2024-06-04)
• Updated input 'haskellNix/stackage':
    'github:input-output-hk/stackage.nix/5964d4ef5062c2530502330605200796801a1052?narHash=sha256-0MMsCMyHDO1jv/DZC%2Bg3rcNTNk/zfE9oeHTlM/rU4MU%3D' (2024-04-13)
  → 'github:input-output-hk/stackage.nix/6c6db491b4a4aab289fe0a5ada8bb9bfb842b23c?narHash=sha256-QUGjB0OLnmXrS%2Bu4jCdvawfWfngv%2BR99qmbFvpRaW4I%3D' (2024-06-08)
• Updated input 'iohk-nix':
    'github:input-output-hk/iohk-nix/86421fdd89b3af43fa716ccd07638f96c6ecd1e4?narHash=sha256-IyLoP%2BzhuyygLtr83XXsrvKyqqLQ8FHXTiySFf4FJOI%3D' (2023-05-16)
  → 'github:input-output-hk/iohk-nix/29f19cd41dc593cf17bbc24194e34e7c20889fc9?narHash=sha256-G1LFsvP53twrqaC1FVard/6rjJJ3oitnpJ1E%2BmTZDGM%3D' (2024-05-16)
• Updated input 'iohk-nix/blst':
    'github:supranational/blst/03b5124029979755c752eec45f3c29674b558446?narHash=sha256-xero1aTe2v4IhWIJaEDUsVDOfE77dOV5zKeHWntHogY%3D' (2022-06-25)
  → 'github:supranational/blst/3dd0f804b1819e5d03fb22ca2e6fac105932043a?narHash=sha256-oqljy%2BZXJAXEB/fJtmB8rlAr4UXM%2BZ2OkDa20gpILNA%3D' (2023-08-09)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2024-06-13 10:38:01 +00:00
Yvan Sraka
086bfa55b4
Fix [: -v: unary operator expected (#158)
* Fix `[: -v: unary operator expected`

```
/nix/store/1zcy75q3dr61bka5h4r8rf3kv8k18kw3-ghc96-iog-env.sh: line 1944: [: -v: unary operator expected
```
e.g. seen on https://github.com/IntersectMBO/cardano-node/actions/runs/8977554294/job/24656515205?pr=5817, in the Build all step.

* Update quirks.nix
2024-05-13 12:47:07 +00:00
Yvan Sraka
559157f331
Patch "HLS stuck (init then no progress) since multi home support" (#156)
https://github.com/haskell/haskell-language-server/issues/4046
2024-04-23 21:10:44 +00:00
Yvan Sraka
ff46fd1c50
Fix DevContainer test harness (#155) 2024-04-16 09:21:16 +00:00
Yvan Sraka
35d560306d
Retrieve ~/.cabal-devx and ~/.cache from GHA cache in Codespaces (#154) 2024-04-16 08:33:56 +00:00
Moritz Angermann
30f0b9b7a9
No more Node.js 16 (#153) 2024-04-16 02:47:01 +00:00
Yvan Sraka
c79eecfe19
Fix #132: add support for GHC 9.6.4 (#134)
* Fix #132: add support for GHC 9.6.4

`nix flake lock --update-input haskellNix`

* Drop ghc99

* Set hlint for 9.2.8 to 3.6.1

* Bump max compiler.

Maybe we want to this actually be "unreleased"?

* disable hls for 9.7+

We need to find a hls (and have it in haskell.nix) that builds with 9.8 🤦

* Try to fix tools

* 9.0 use lhs 2.4

* Split out IOGFull into static as well.

* cleanup R

* fix typo

* R doesn't build for aarch64-musl

* Disable R on aarch64; disable hls on -js and -windows

* Disable R (libjpeg-turbo fails to build for x86_64-musl)

---------

Co-authored-by: Moritz Angermann <moritz.angermann@gmail.com>
2024-04-16 00:32:45 +00:00
Yvan Sraka
82eb2a0633
Fix CODESPACE_TOKEN: unbound variable (#152)
Revision (input-output-hk/devx): 0a5cefb55c.
/nix/store/2nigzj6x6d0qkzqvvyf5604g0581r8z6-ghc810-env.sh: line 1937: CODESPACE_TOKEN: unbound variable
CABAL_DIR set to /Users/runner/.cabal-devx

Notice: Hint: to reproduce this environment locally, use either: `nix develop github:input-output-hk/devx#ghc8107`, or `docker run -it -v $(pwd):/workspaces ghcr.io/input-output-hk/devx-devcontainer:x86_64-linux.ghc8107`
2024-04-13 13:36:42 +00:00
Yvan Sraka
5a5783037a
Fix GHA cache usage in devx-container ... (#151) 2024-04-13 08:52:20 +00:00
Yvan Sraka
aab645815c
Fix a typo in Dockerfile (#150) 2024-04-13 08:28:02 +00:00
Yvan Sraka
b37cc6f3d4
Refactor wait-and-upload GitHub Action (#144) 2024-04-13 08:06:14 +00:00
Yvan Sraka
ce013269ab
Update DevContainer settings and instructions in README (#149) 2024-04-13 08:02:56 +00:00
Yvan Sraka
0a5cefb55c
Improve devshell welcome message in GitHub Codespace (#147) 2024-04-11 12:04:16 +00:00
Yvan Sraka
fec21531a5
Fix default Haskell VSCode extension settings in GitHub Codespace (#146) 2024-04-11 07:09:27 +00:00
Yvan Sraka
b915e67dbf
Fix dev-container image generation for GitHub Codespace (#145) 2024-04-10 13:35:38 +00:00
Yvan Sraka
c212848a31
Fix codespace-upload action that wrongly name devx-containers (#143)
e.g. `x86_64-linux.ghc96-jsfalse` rather than `x86_64-linux.ghc96-js` ...
2024-04-10 08:20:07 +00:00
Yvan Sraka
25aa06c5ee
Fix No space left on device error while ghcr-upload job in GitHub Action (#142) 2024-04-09 18:00:05 +00:00
Yvan Sraka
36d5241fea
Fix No space left on device while building devx-container in GitHub Action (#141) 2024-04-09 12:50:51 +00:00
Yvan Sraka
1a244f104e
Update cleanup.yml (#140) 2024-04-09 12:50:44 +00:00
Yvan Sraka
3e7626140b
Improve GitHub Codespace first-launch time by preloading .cache (#128) 2024-04-08 09:27:17 +00:00
Yvan Sraka
db7ea17fbb
Add hint to reproduce the devshell flavor locally if within GitHub Action (#138)
Co-authored by @angerman that got the original idea and improve the style of the Nix expressions
2024-04-04 10:46:24 +00:00
Matthias Benkort
bb543f0a61
Add missing libblst to GHC options of wrapped-cabal in static mode. (#125)
* Add missing libblst to GHC options of wrapped-cabal in static mode.

* comment out post-fixup

* Overwrite buildPhase for libblst static

  The current buildPhase in NixOS/nixpkgs does something like this:

  ```
  ./build.sh ${lib.optionalString stdenv.hostPlatform.isWindows "flavour=mingw64"}
  ./build.sh -shared ${lib.optionalString stdenv.hostPlatform.isWindows "flavour=mingw64"}
  ```

  So we do build both a dynamic and static version, for convenience,
  which is then correctly visible in the nix store (both `.a` and
  `.dylib` are present).

  BUT, it seems that because of the presence of the dynamic lib, cabal
  or GHC (?) still chose to bundle the library dynamically despite the
  static flags. Removing the `.dylib` from the nix store recover the
  expected behavior (libblst being statically linked).

  This is odd, but the current fix is to not build the `-shared` version
  of the library at all when in the static shell.

  Co-authored-by: yvan-sraka <yvan@sraka.xyz>

* Enforce the use of static libraries in `-static` devshell

---------

Co-authored-by: Yvan Sraka <yvan@sraka.xyz>
2024-04-04 07:07:56 +00:00
Yvan Sraka
8dcb4f05f6
Create a simple GHA that cleanup untagged devx-container daily (#137) 2024-04-04 01:51:05 +00:00
Yvan Sraka
be992af48f
Add instructions on how to use DevContainers outside of GitHub or VSCode (#135) 2024-04-04 01:50:16 +00:00
Yvan Sraka
4604d892a6
Finish the -iog-full flavor by generating the corresponding devx-container (#139) 2024-04-03 16:33:03 +00:00
Sean Gillespie
e489b1b52f
feature(ci): Add "iog-full" flavor to github CI (#133) 2024-04-02 13:14:51 +00:00
Yvan Sraka
6049c0f071
Fix #116: trusted-users allows running commands as root without password (#130)
Update `README.md` to rather suggest user to directly put the
`extra-substituters` in `/etc/nix/nix.conf` and remove `nixConfig`
attribute from the `flake.nix`.
2024-03-26 12:57:20 +00:00
zeme-wana
eba5f8dc48
Fix small typo in the README.md (#131) 2024-03-26 12:36:31 +00:00
Yvan Sraka
9a480f9f77
Add -iog-full flavor (with R and Postgres) (#129) 2024-03-21 12:42:13 +00:00
Yvan Sraka
2f4fa7f42a
Update Dockerfile (#127) 2024-02-27 12:45:59 +00:00
Yvan Sraka
773769612b
Update README.md (#126) 2024-02-27 08:50:43 +00:00
Yvan Sraka
b2073bd49e
Update README.md (#121) 2024-01-26 05:56:27 +00:00
Yvan Sraka
3126fed8ca
Update wait-and-upload.yml (#120) 2024-01-16 08:22:21 +00:00
Sean Gillespie
a69e139242
fix: Add curl to cabal wrapper (#119) 2024-01-08 15:15:09 +00:00
Hamish Mackenzie
2a8b2cbf7d
Update hello.yml with short compiler-nix-names (#113)
* Update hello.yml with short compiler-nix-names

* Try fix for bool issue

* Use latest action branch now it is fixed
2023-10-25 04:18:50 +00:00
Hamish Mackenzie
fb0fbe3010
Add ghc980 and ghc99 (#111)
* Add ghc98020230824 and ghc9920230923

* pkgconfig is now pkg-config in nixpkgs

* Point to haskell.nix with aarch64-linux

* Use static nix-tools to get cabal

* Use short compiler-nix-names

* Fix cabal-install failure

* Fix eval

* Fix eval

* Update haskell.nix

* Fixes for ghc 9.8.1

* Update github actions

* Fixes for hydra eval

* Use short names and refactor a bit

* Fix hlint build filter

* Add missing toolsModule

* Fix tools for ghc >=9.8

* Stick with long ghc nix names for now

* Use short names

* Leave hello.yml for now
2023-10-18 09:25:31 +00:00
Yvan Sraka
979fc22a3d
Create lints.yml (#110) 2023-10-18 04:17:58 +00:00
Yvan Sraka
647802e804
Add a handy curl https://input-output-hk.github.io/devx | sh script (#108)
This should help newcommers that have several machines to onboard :)
2023-10-18 04:17:14 +00:00
Moritz Angermann
a2f3af3530
Update cross-windows.nix (#107)
* Update cross-windows.nix

* Update cross-windows.nix
2023-10-18 04:15:36 +00:00
Moritz Angermann
523d0f296d
Try wait-for-hydra action (#105)
* Update main.yml

* Update main.yml

* Update main.yml
2023-10-18 04:14:02 +00:00
Moritz Angermann
cf203c4609
Add overall required job (#106)
* Update flake.nix

* Update flake.nix

* Update flake.nix

* Update flake.nix

* Fix nixutils back to numtide

* ???

* ???

* 🤦

* 🤯

* yuck!
2023-10-18 04:10:55 +00:00
Moritz Angermann
b6ff21f7bb
Add required job (#103)
* Add required job

* Update flake.nix
2023-09-12 06:14:51 +00:00
Yvan Sraka
bd723cf4e8
Wait and upload for Hydra (#99)
1. Hydra
2. DevX closures
3. Devcontainer
2023-09-11 23:14:47 +00:00
Yvan Sraka
3fef25f46e
Expose CABAL_PROJECT_LOCAL_TEMPLATE as a /nix/store/ file (#97) 2023-09-08 06:30:43 +00:00
Hamish Mackenzie
91cba01b90
Run tests with wine by default (#53)
* Run tests with wine by default

When cross compiling for windows use set the cabal flag `--test-wrapper` to point at a script that runs the test in wine.

* Tidy up

* Comment

* Comment

* Comment
2023-09-08 01:36:56 +00:00
Yvan Sraka
f87e9247b5
Update HLS to version 2.0 (#96) 2023-08-29 02:52:51 +00:00
Yvan Sraka
0e3aa4ae96
Add aarch64-linux to GitHub Codespace Action to support macOS M1/M2 VSCode DevContainers (#83) 2023-08-10 07:31:50 +00:00
Yvan Sraka
95632aee9e
Create update-flake-lock.yml (#84) 2023-08-10 07:29:37 +00:00
Yvan Sraka
b6a3d614b9
Add gh, jq and yq-go (#85)
- https://github.com/cli/cli
- https://github.com/jqlang/jq
- https://github.com/mikefarah/yq
2023-08-10 07:28:20 +00:00