Commit graph

16 commits

Author SHA1 Message Date
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Lily Ballard 722cc88865 psc-package: Adopt new installShellCompletion syntax 2020-10-08 15:08:40 -07:00
Lily Ballard 4ebc22781d psc-package: Stop using haskellPackages to build
Switch to the approach taken by
https://github.com/justinwoo/easy-purescript-nix/blob/master/psc-package-simple.nix

This downloads a prebuilt release and patches the linker paths. It
reduces the number of supported platforms, but ensures we're using the
official supported psc-package compiler. The `haskellPackages` approach
wasn't supported and was leading to version conflicts with dependencies.
2020-03-19 15:00:36 -07:00
R. RyanTM d217d4c63c psc-package: 0.6.0 -> 0.6.2 2020-02-11 18:05:29 +01:00
R. RyanTM 7cbcfa08a5 psc-package: 0.5.1 -> 0.6.0 2020-01-26 10:12:05 +00:00
R. RyanTM aeb51ab1f2 psc-package: 0.4.2 -> 0.5.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/psc-package/versions
2019-01-31 19:06:04 +01:00
R. RyanTM b766332d22 psc-package: 0.4.1 -> 0.4.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/psc-package/versions
2018-11-09 15:36:00 +01:00
Justin Woo 7dadfbda1f psc-package: 0.3.2 -> 0.4.1
Updates that remove features and improve user experience.

Adds warnings for trying to install packages without (purescript/psc-package#126 by @Dretch)
Filters "installing" messages for build (purescript/psc-package#130 by @Dretch)
Adds options for limiting jobs for install (purescript/psc-package#127 by @vladciobanu)
Per purescript/psc-package#121, removes the confusing misfeature "add-from-bower", which led to many users thinking this command was for adding "extra-deps" like Stack. See the thread for details on how you could readily replace this command if you used it before.
2018-07-28 23:03:43 +02:00
Jonathan Curran 7a510176c2 psc-package v0.3.2-pre -> v0.3.2
v0.3.2 is released
2018-04-07 16:00:33 -06:00
Maxime Dénès 1e1839239c psc-package: 0.2.5 -> 0.3.2-pre
Note: the previous version was not building due to outdated upstream
dependencies.
2018-03-31 10:42:42 +01:00
Profpatsch 53e790e7a8 maintainers: capitalize the Profpatsch attribute (vanity)
Since I’m already at it, this has been bothering me for a while.
2018-02-12 07:24:50 +01:00
Tomasz Rybarczyk 911dd477fb psc-package: 0.2.4 -> 0.2.5 2017-12-04 00:11:27 +01:00
Maxime Dénès a53462ea85 psc-package: 0.2.0 -> 0.2.4 2017-11-08 18:06:51 +01:00
Profpatsch d314a65c23 psc-package: 0.1.1 -> 0.2.0 2017-07-12 15:56:57 +02:00
Profpatsch 7df8e53d28 psc-package: init at 0.1.1 2017-04-15 16:10:13 +02:00