diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/patches/purescript-relax-dependencies.patch | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
| download | guix-1a5302435ff0d2822b823f5a6fe01faa7a85c629.tar.gz | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in: gnu/local.mk gnu/packages/databases.scm gnu/packages/glib.scm gnu/packages/gnome.scm gnu/packages/gnupg.scm gnu/packages/gnuzilla.scm gnu/packages/graphics.scm gnu/packages/gstreamer.scm gnu/packages/gtk.scm gnu/packages/linux.scm gnu/packages/machine-learning.scm gnu/packages/networking.scm gnu/packages/polkit.scm gnu/packages/pulseaudio.scm gnu/packages/rpc.scm gnu/packages/rust.scm gnu/packages/version-control.scm gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/patches/purescript-relax-dependencies.patch')
| -rw-r--r-- | gnu/packages/patches/purescript-relax-dependencies.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/gnu/packages/patches/purescript-relax-dependencies.patch b/gnu/packages/patches/purescript-relax-dependencies.patch deleted file mode 100644 index 6ab4716fc4..0000000000 --- a/gnu/packages/patches/purescript-relax-dependencies.patch +++ /dev/null @@ -1,40 +0,0 @@ -Allow the purescript dependencies to better match the available packages in -Guix. - ---- purescript-0.13.8/purescript.cabal -+++ purescript-0.13.8/purescript.cabal.orig -@@ -1091 +1091 @@ library -- Glob ==0.9.*, -+ Glob ==0.10.*, -@@ -1095 +1095 @@ library -- ansi-terminal >=0.7.1 && <0.9, -+ ansi-terminal ==0.9.*, -@@ -1105 +1105 @@ library -- clock <0.8, -+ clock ==0.8.*, -@@ -1173 +1173 @@ executable purs -- Glob ==0.9.*, -+ Glob ==0.10.*, -@@ -1177 +1177 @@ executable purs -- ansi-terminal >=0.7.1 && <0.9, -+ ansi-terminal ==0.9.*, -@@ -1188 +1188 @@ executable purs -- clock <0.8, -+ clock ==0.8.*, -@@ -1209 +1209 @@ executable purs -- network >=3.0.1.1 && <3.1, -+ network >=2.8 && <3.1, -@@ -1288 +1288 @@ test-suite tests -- Glob ==0.9.*, -+ Glob ==0.10.*, -@@ -1293 +1293 @@ test-suite tests -- ansi-terminal >=0.7.1 && <0.9, -+ ansi-terminal ==0.9.*, -@@ -1303 +1303 @@ test-suite tests -- clock <0.8, -+ clock ==0.8.*, -@@ -1315,2 +1315,2 @@ test-suite tests -- hspec <2.7, -- hspec-discover <2.7, -+ hspec ==2.7.*, -+ hspec-discover ==2.7.*, |