Commit Graph

231 Commits

Author SHA1 Message Date
Phil de Joux
00dbed97eb
Typo recommended 2023-11-19 14:06:55 -05:00
Michael Peyton Jones
7aa5ca927b
Merge pull request #84 from input-output-hk/update_flake_lock_action
Update flake.lock
2023-11-08 17:37:41 +00:00
github-actions[bot]
82eb3415f9 flake.lock: Update
Flake lock file updates:

• Updated input 'hackage-nix':
    'github:input-output-hk/hackage.nix/fe2ea45b10e70de695c00ca83986760e6dcd6948' (2023-09-14)
  → 'github:input-output-hk/hackage.nix/22ab6ca22da8ad7e8fb1318549c63e92ef6b0c2e' (2023-11-04)
• Updated input 'haskell-nix':
    'github:input-output-hk/haskell.nix/8a9dfba4f51e0b3d0b426a1ae787926821993ec6' (2023-09-14)
  → 'github:input-output-hk/haskell.nix/0ad13ce1afd48351822d713385bb0f8a742703a0' (2023-11-04)
• Removed input 'haskell-nix/ghc980'
• Added input 'haskell-nix/ghc98X':
    'git+https://gitlab.haskell.org/ghc/ghc?ref=ghc-9.8&rev=443e870d977b1ab6fc05f47a9a17bc49296adbd6' (2023-10-07)
• Updated input 'haskell-nix/ghc99':
    'git+https://gitlab.haskell.org/hamishmack/ghc?ref=hkm/bump-Cabal&rev=b2bddd0b8214ac1db6239cc25f7c0aabeb2ebb70' (2023-09-06)
  → 'git+https://gitlab.haskell.org/ghc/ghc?ref=refs/heads/master&rev=f383a242c76f90bcca8a4d7ee001dcb49c172a9a' (2023-10-11)
• Added input 'haskell-nix/hls-2.3':
    'github:haskell/haskell-language-server/458ccdb55c9ea22cd5d13ec3051aaefb295321be' (2023-09-28)
• Added input 'haskell-nix/hls-2.4':
    'github:haskell/haskell-language-server/362fdd1293efb4b82410b676ab1273479f6d17ee' (2023-10-10)
• Updated input 'haskell-nix/nixpkgs-2305':
    'github:NixOS/nixpkgs/b81af66deb21f73a70c67e5ea189568af53b1e8c' (2023-07-30)
  → 'github:NixOS/nixpkgs/715d72e967ec1dd5ecc71290ee072bcaf5181ed6' (2023-09-22)
• Updated input 'haskell-nix/nixpkgs-unstable':
    'github:NixOS/nixpkgs/3acb5c4264c490e7714d503c7166a3fde0c51324' (2023-07-30)
  → 'github:NixOS/nixpkgs/e12483116b3b51a185a33a272bf351e357ba9a99' (2023-09-21)
• Updated input 'haskell-nix/stackage':
    'github:input-output-hk/stackage.nix/a59f88d7837f0c537efc7de53dad276e3d9da4ba' (2023-09-14)
  → 'github:input-output-hk/stackage.nix/b2713dcef4034be8b297df48a36451c9217ca534' (2023-11-04)
2023-11-05 00:24:39 +00:00
Michael Peyton Jones
fe9187f563
Merge pull request #86 from input-output-hk/andrea/show-error
Let curl show errors when something fails
2023-10-13 09:53:28 +01:00
Andrea Bedini
b8d863daab Let curl show errors when something fails 2023-10-13 13:18:50 +08:00
Andrea Bedini
cbd0c5da8f
Minimal test suite (#81)
* Minimal test suite

- Add support for urls with file: schema; both absolute (file:/path) and
  relative (file:path) paths are supported.

- Log curl invocation in case of failure

- Rename fetchRemoteAsset to fetchURL

- Add verbosity flag

- Bump GHC to 9.4.7

- Bump flake inputs

* Apply suggestions from code review

Co-authored-by: Michael Peyton Jones <me@michaelpj.com>

* Add short option '-v' for '--verbosity'

* Whitespace

* Add comment explaining why the dot

* Rename withFixture to inTemporaryDirectoryWithFixture

* Small refactor of PrepareSource

* Rename TarballSource to URISource

- Move sourceUrl to Foliage.Meta.packageVersionSourceToUri

* Simplify inTemporaryDirectoryWithFixture

* Document tar and cp flags

* Reformat

---------

Co-authored-by: Michael Peyton Jones <me@michaelpj.com>
2023-09-15 12:18:30 +08:00
Andrea Bedini
1c06741cc8 Reorganise GH workflows 2023-09-14 15:53:59 +08:00
Andrea Bedini
c11fe72425 Add fourmolu to the nix devshell
Use that in the CI
2023-09-14 15:53:59 +08:00
Andrea Bedini
cc610620d6 Formatting with fourmolu 2023-09-14 15:53:59 +08:00
Michael Peyton Jones
b18d165702
Merge pull request #83 from input-output-hk/andrea/fix-flake-utils
Fix flake-utils input and flake lock bump
2023-09-13 11:14:44 +01:00
Andrea Bedini
870efd8f73 Flake lock bump 2023-09-13 15:11:59 +08:00
Andrea Bedini
9388975cb6 Use flake-utils from numtide 2023-09-13 15:11:45 +08:00
Andrea Bedini
ea683454f9 Disable aarch64-linux because Hydra 2023-09-11 13:18:05 +08:00
Andrea Bedini
e6de3b29bc Retry few times if curl fails 2023-09-11 13:18:05 +08:00
Andrea Bedini
d265965889 Bump workflows/nix.yml a bit 2023-09-11 13:18:05 +08:00
Andrea Bedini
bae0096f26 Improve some instances of Show 2023-09-11 13:18:05 +08:00
Andrea Bedini
c1d2b0e0b2 Update flake config 2023-09-11 13:18:05 +08:00
Andrea Bedini
637b266700 Handle curl failure 2023-09-11 13:18:05 +08:00
Andrea Bedini
31d2455f44 Make curl fail on HTTP code >=400 2023-09-11 13:18:05 +08:00
Yvan Sraka
1a307b9f44 Delete release.yml 2023-08-08 13:50:54 +08:00
Yvan Sraka
d80b52de22
Merge pull request #74 from input-output-hk/yvan-sraka-patch-1-1
Use `DeterminateSystems/magic-nix-cache-action`
2023-07-28 11:21:50 +02:00
Yvan Sraka
e598d3b6f6
Update nix.yml 2023-07-25 16:35:35 +02:00
Andrea Bedini
68a0109a09
Merge pull request #72 from bgamari/wip/T71 2023-07-03 19:38:08 +08:00
Ben Gamari
7b86fadffd flake: Wrap foliage executable with needed dependencies
Previously the `app` outputs of the flake were not usable in a minimal
environment as `foliage` requires `curl` and `patch` in `PATH`. Ensure
that these are available.

Fixes #71.
2023-06-30 12:47:53 -04:00
Andrea Bedini
763e77028c
Merge pull request #70 from input-output-hk/yvan-sraka-patch-1
Add macOS artifacts to GitHub releases
2023-06-22 16:04:13 +08:00
Yvan Sraka
317cabf8e0
Update release.yml 2023-06-20 11:57:17 +02:00
Yvan Sraka
d68add56b4
Add macOS artifacts to GitHub releases
This fix https://github.com/input-output-hk/foliage/issues/62 but require https://github.com/input-output-hk/foliage/issues/47 to be addressed first!
2023-06-18 12:43:17 +02:00
Andrea Bedini
f25603f3c6
Merge pull request #69 from bgamari/main 2023-06-16 08:20:01 +08:00
Ben Gamari
1cc2db12ac foliage: Force FileInfo
Unfortunately hackage-security constructs these using lazy bytestrings
and they are therefore liable to hold open fds longer than necessary,
resulting in fd exhaustion.

Fixes another manifestation of #35.
2023-06-15 11:16:59 -04:00
Andrea Bedini
a938062863
Merge pull request #68 from input-output-hk/yvan-sraka-patch-1
Update `release.yml`
2023-06-09 12:43:38 +08:00
Yvan Sraka
48856e3ce0
Update release.yml
This is tested and working … but only for `x86_64-linux`, `flake.nix` should be updated to support other platforms :)
2023-06-08 14:32:16 +02:00
Andrea Bedini
8a549d6b9f
Merge pull request #67 from input-output-hk/yvan-sraka-patch-1
Update `release.yml`
2023-06-06 21:38:05 +08:00
Yvan Sraka
eb060cd480
Update release.yml 2023-06-06 14:05:42 +02:00
Andrea Bedini
7474ed7e4c
Merge pull request #66 from amesgen/fix-deprecations
Fix `preferred-versions` format
2023-06-06 10:00:30 +08:00
amesgen
9833056b60
Fix preferred-versions format
Co-authored-by: Andrea Bedini <andrea@andreabedini.com>
2023-06-05 14:49:55 +02:00
Andrea Bedini
0f408ad7bc
Update release.yml 2023-06-05 20:33:26 +08:00
Andrea Bedini
e36b704aa8
Update release.yml 2023-06-05 20:31:20 +08:00
Andrea Bedini
7855aaa238
Merge pull request #64 from input-output-hk/62-build-foliage-binaries 2023-06-04 14:25:14 +08:00
Andrea Bedini
4a11e81c9c
Merge pull request #65 from input-output-hk/andrea/fix-dependencies-again 2023-06-01 07:10:56 +08:00
Andrea Bedini
dce8dade86 Another go at the dependencies 2023-06-01 00:35:17 +08:00
Yvan Sraka
ad5b4b7e20
Fix #62: Build foliage binaries
Implemented a GA using Nix for automatic build and publish a GitHub release from the latest `main` branch commit.

Consider using git tags for more controlled versioning and releases.
2023-05-31 10:22:59 +02:00
Andrea Bedini
32c033cd57
Merge pull request #63 from input-output-hk/andrea/hackage-urls
Implement revision urls, drop "index/" url
2023-05-30 16:56:27 +08:00
Andrea Bedini
c300284fbf Add url for latest cabal file 2023-05-30 16:46:46 +08:00
Andrea Bedini
0d0603b0d3 Stick to GHC minor versions 2023-05-30 13:27:51 +08:00
Andrea Bedini
f294fcf6eb Implement revision urls, drop "index/" url 2023-05-30 12:42:19 +08:00
Andrea Bedini
c9d3a0bbb9
Merge pull request #61 from input-output-hk/website-package-dependencies
Add build dependencies to package pages
2023-05-29 15:39:16 +08:00
Andrea Bedini
56f8b81838 Display conditionals correctly 2023-05-29 15:27:22 +08:00
Andrea Bedini
e51484454e Display build dependencies better 2023-05-29 13:41:39 +08:00
Andrea Bedini
1f899fe101 Add build dependencies to package pages
Closes #59
2023-05-29 13:41:07 +08:00
Andrea Bedini
eb0e97d919
Merge pull request #60 from input-output-hk/tidy-up
Tidy-up
2023-05-24 11:50:19 +08:00