Skip to content

haskell-spacecookie: fix build #75147

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
cdepillabout merged 2 commits into from
Dec 7, 2019
Merged

haskell-spacecookie: fix build #75147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61d9d77
haskell-systemd: use correct version of network to fix the build
sternenseemann Dec 7, 2019
4753c9f
haskell-spacecookie: use correct version of systemd to fix the build
sternenseemann Dec 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
8 changes: 8 additions & 0 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 @@ -394,6 +394,11 @@ self: super: {
Random123 = dontCheck super.Random123;
systemd = dontCheck super.systemd;

# use the correct version of network
systemd_2_2_0 = dontCheck (super.systemd_2_2_0.override {
network = self.network_3_1_1_1;
});

# https://github.com/eli-frey/cmdtheline/issues/28
cmdtheline = dontCheck super.cmdtheline;

Expand Down Expand Up @@ -1314,4 +1319,7 @@ self: super: {
# https://github.com/kazu-yamamoto/dns/issues/150
dns = dontCheck super.dns;

# needs newer version of the systemd package
spacecookie = super.spacecookie.override { systemd = self.systemd_2_2_0; };

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
1 change: 0 additions & 1 deletion pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9111,7 +9111,6 @@ broken-packages:
- SourceGraph
- sousit
- soyuz
- spacecookie
- SpaceInvaders
- spacepart
- SpacePrivateers
Expand Down