Skip to content

Commit 5edfaaf

Browse files
committed
Cleanup
1 parent bbe6c66 commit 5edfaaf

4 files changed

Lines changed: 4 additions & 33 deletions

File tree

.github/scripts/brew.sh

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/haskell.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ jobs:
7272
- if: runner.os == 'macOS'
7373
name: Install automake via brew
7474
run: |
75-
bash .github/scripts/brew.sh autoconf automake libtool gettext
76-
echo "$HOME/.brew/bin" >> $GITHUB_PATH
77-
echo "$HOME/.brew/sbin" >> $GITHUB_PATH
75+
brew install autoconf automake libtool gettext
7876
7977
- id: get
8078
run: |

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ This project is separated into two packages:
66

77
* `libarchive`: the Haskell bindings (this is what you want to depend on)
88
* `libarchive-clib`: bundled C sources to avoid depending on system libarchive
9-
* `zlib-clib`: bundled C sources to avoid depending on system zlib
109

1110
## Installing from Git
1211

@@ -25,7 +24,6 @@ source-repository-package
2524
tag: <sha>
2625
subdir: libarchive
2726
libarchive-clib
28-
zlib-clib
2927
post-checkout-command: sh -c "cd libarchive-clib && autoreconf -i"
3028
```
3129

libarchive-clib/libarchive-clib.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,11 @@ library
9393
./c/archive_entry_stat.c
9494
./c/archive_entry_strmode.c
9595
./c/archive_entry_xattr.c
96-
./c/archive_parse_date.c
97-
./c/archive_time.c
9896
./c/archive_hmac.c
9997
./c/archive_match.c
10098
./c/archive_options.c
10199
./c/archive_pack_dev.c
100+
./c/archive_parse_date.c
102101
./c/archive_pathmatch.c
103102
./c/archive_ppmd7.c
104103
./c/archive_ppmd8.c
@@ -154,6 +153,7 @@ library
154153
./c/archive_read_support_format_zip.c
155154
./c/archive_string.c
156155
./c/archive_string_sprintf.c
156+
./c/archive_time.c
157157
./c/archive_util.c
158158
./c/archive_version_details.c
159159
./c/archive_virtual.c
@@ -185,8 +185,8 @@ library
185185
./c/archive_write_set_format_ar.c
186186
./c/archive_write_set_format_by_name.c
187187
./c/archive_write_set_format.c
188-
./c/archive_write_set_format_cpio.c
189188
./c/archive_write_set_format_cpio_binary.c
189+
./c/archive_write_set_format_cpio.c
190190
./c/archive_write_set_format_cpio_newc.c
191191
./c/archive_write_set_format_cpio_odc.c
192192
./c/archive_write_set_format_filter_by_ext.c

0 commit comments

Comments
 (0)