Skip to content

Remove regex-pcre-builtin#390

Merged
fosskers merged 6 commits intofosskers:aura-1.4from
theotherjimmy:remove-regex
Apr 26, 2016
Merged

Remove regex-pcre-builtin#390
fosskers merged 6 commits intofosskers:aura-1.4from
theotherjimmy:remove-regex

Conversation

@theotherjimmy
Copy link
Contributor

@theotherjimmy theotherjimmy commented Feb 15, 2016

No description provided.

@fosskers
Copy link
Owner

fosskers commented Feb 15, 2016

Is this a [WIP]? I feel like there is more regex use than that around.

fosskers
fosskers reviewed Feb 15, 2016
View reviewed changes
src/Aura/MakePkg.hs Outdated

findPkgFile :: FilePath -> Sh [FilePath]
findPkgFile = findDirFilterWhen (pure . const False) (pure . matches)
where matches fp = ["xz", "tar", "pkg"] `isPrefixOf` reverse (extensions fp)
Copy link
Owner

@fosskers fosskers Feb 15, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this also find the .sig file, if one is present?

Copy link
Contributor Author

@theotherjimmy theotherjimmy Feb 15, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so. Also, I don't think that the old code did that. OTOH, I gooffed and that should be "src" and not "pkg".

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Feb 15, 2016

I was just trying to remove the regex-pcre-builtin library dependency.

@theotherjimmy theotherjimmy changed the title Remove regex Remove regex-pcre-builtin Feb 15, 2016
@fosskers
Copy link
Owner

fosskers commented Feb 16, 2016

Great, let me know when I can take a final look at this 👍

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Feb 16, 2016

Should be good to go. It's not a huge change after all.
redacted. Testing now.

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Feb 20, 2016

Tested works for normal, did not test with source build, I assume that it does not work for source builds.

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Feb 20, 2016

Tested source builds. works.

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Feb 20, 2016

@fosskers, I think it's ready.

@fosskers
Copy link
Owner

fosskers commented Feb 21, 2016

Great I'll take a look.

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Mar 11, 2016

Hey @fosskers, What's the verdict?

@fosskers
Copy link
Owner

fosskers commented Mar 15, 2016

Hm, my builds are bailing.

sudo .stack-work/dist/x86_64-linux/Cabal-1.22.5.0/build/aura/aura -Ax packer
[sudo] password for colin: 
aura >>= Determining dependencies...
aura >>= AUR Packages:
packer
aura >>= Continue? [Y/n] 
aura >>= Building `packer`...
x packer/
x packer/.AURINFO
x packer/.SRCINFO
x packer/PKGBUILD
==> Making package: packer 20150808-1 (Mon Mar 14 18:01:49 PDT 2016)
==> Checking runtime dependencies...
==> Checking buildtime dependencies...
==> Retrieving sources...
  -> Cloning packer git repo...
Cloning into bare repository '/home/colin/code/haskell/aura/packer/packer'...
==> Validating source files with md5sums...
    packer ... Skipped
==> Extracting sources...
  -> Creating working copy of packer git repo...
Cloning into 'packer'...
done.
==> Starting pkgver()...
==> Entering fakeroot environment...
==> Starting package()...
==> Tidying install...
  -> Removing libtool files...
  -> Purging unwanted files...
  -> Removing static library files...
  -> Stripping unneeded symbols from binaries and libraries...
  -> Compressing man and info pages...
==> Checking for packaging issue...
==> Creating package "packer"...
  -> Generating .PKGINFO file...
  -> Generating .BUILDINFO file...
  -> Generating .MTREE file...
  -> Compressing package...
==> Leaving fakeroot environment.
==> Finished making: packer 20150808-1 (Mon Mar 14 18:02:07 PDT 2016)
loading packages...
resolving dependencies...
warning: packer-20150808-1 is up to date -- reinstalling
looking for conflicting packages...

Packages (1) packer-20150808-1

Total Installed Size:  0.05 MiB
Net Upgrade Size:      0.00 MiB

:: Proceed with installation? [Y/n] 
aura: 
Ran commands: 
pwd
cd /var/cache/pacman/pkg/
cd /home/colin/code/haskell/aura
pacman -U /home/colin/code/haskell/aura/packer/packer-20150808-1-any.pkg.tar.xz
which pacman

Exception: error running: pacman -U /home/colin/code/haskell/aura/packer/packer-20150808-1-any.pkg.tar.xz
exit status: 1

Not sure if its 1.4 or this PR in particular.

@fosskers
Copy link
Owner

fosskers commented Mar 15, 2016

Seems to be both. On aura-1.4, built packages are dumped into ./ and then not installed. makepkg succeeds, and then aura exits without trying to install the built package.

On this branch, the build seems to succeed but the installation fails.

Are you seeing this behaviour?

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Apr 19, 2016

Yes. I'm working on a PR that fixes it.

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Apr 24, 2016

@fosskers, this is ready for review.

@fosskers fosskers merged commit e867066 into fosskers:aura-1.4 Apr 26, 2016
@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Oct 16, 2016

Good plan. 👍

On Oct 16, 2016 16:21, "Colin Woodbury" notifications@github.com wrote:

@theotherjimmy https://github.com/theotherjimmy I'm going to borrow
these changes back into master, so we can dump the old dep for 1.3.7.

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#390 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAp1YTtJEj42lxPqpVnOBFXSsfdL8hOJks5q0pV1gaJpZM4HaAEk
.

@fosskers
Copy link
Owner

fosskers commented Oct 17, 2016

Actually it turns out the offending regex-pcre-builtin is still in [haskell-core], so I'm keeping it for now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@theotherjimmy @fosskers