Skip to content

haskellPackages: unbreak cachix, hnix, hnix-store-remote #68272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peti merged 3 commits into from
Sep 7, 2019
Merged

haskellPackages: unbreak cachix, hnix, hnix-store-remote #68272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76e42da
haskellPackages: unbreak cachix build
marsam Sep 7, 2019
0a74974
haskellPackages.hnix: unmark as broken
marsam Sep 7, 2019
2d02797
haskellPackages.hnix-store-remote: unmark as broken
marsam Sep 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,6 @@ self: super: {
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
};

# compatibility with servant-0.16.2. Remove with the next release
cachix = appendPatch super.cachix (pkgs.fetchpatch {
url = "https://github.com/cachix/cachix/commit/051679a99cd56e2497c0f05310035b6649129a13.patch";
sha256 = "198n5byp9mfiymgzpvyd42l6vqy6hfy9kdi7svfx7mcwsy7sg7kp";
stripLen = 1;
});

# Fix test trying to access /home directory
shell-conduit = overrideCabal super.shell-conduit (drv: {
postPatch = "sed -i s/home/tmp/ test/Spec.hs";
Expand Down
3 changes: 0 additions & 3 deletions pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3598,7 +3598,6 @@ broken-packages:
- cabin
- cabocha
- cached
- cachix
- cacophony
- caffegraph
- cairo-core
Expand Down Expand Up @@ -5935,8 +5934,6 @@ broken-packages:
- hmt-diagrams
- hmumps
- hnetcdf
- hnix
- hnix-store-remote
- HNM
- hnormalise
- ho-rewriting
Expand Down