git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Actually do not patch .gitignore
commit6a2fe9ae07de5be7d3cf5410af556ce2f06a0a7d authorKirill Elagin <kirelagin@gmail.com> dateMon 10 Feb 2020, 23:23 (7 years ago) parentf754c5b
4 files changed−68
compare with iko/ghcjs-patch-master
unifiedsplit
overlays/patches/ghc/iserv-autoconf-8.4.1.patch−21 overlays/patches/ghc/iserv-autoconf-8.6.1.patch−21 overlays/patches/ghc/iserv-cleanup-8.8.1.patch−12 overlays/patches/ghc/iserv-move-8.4.1.patch−14
overlays/patches/ghc/iserv-autoconf-8.4.1.patch−21
@@ -33,27 +33,6 @@ Differential Revision: https://phabricator.haskell.org/D5302
3333 rename utils/iserv-proxy/{iserv-proxy.cabal => iserv-proxy.cabal.in} (91%)
3434 rename utils/iserv/{iserv.cabal => iserv.cabal.in} (81%)
3535
36−diff --git a/.gitignore b/.gitignore
37−index 0d3a3a24d8..f4f8529f0a 100644
38−--- a/.gitignore
39−+++ b/.gitignore
40−@@ -148,6 +148,7 @@ _darcs/
41− /libraries/hslogo-16.png
42− /libraries/index-frames.html
43− /libraries/index.html
44−+/libraries/libiserv/libiserv.cabal
45− /libraries/minus.gif
46− /libraries/ocean.css
47− /libraries/plus.gif
48−@@ -173,6 +174,8 @@ _darcs/
49− /testsuite_summary*.txt
50− /testsuite*.xml
51− /testlog*
52−+/utils/iserv/iserv.cabal
53−+/utils/iserv-proxy/iserv-proxy.cabal
54− /utils/mkUserGuidePart/mkUserGuidePart.cabal
55− /utils/runghc/runghc.cabal
56− /utils/gen-dll/gen-dll.cabal
5736diff --git a/configure.ac b/configure.ac
5837index 30241a5734..a5d2026434 100644
5938--- a/configure.ac
overlays/patches/ghc/iserv-autoconf-8.6.1.patch−21
@@ -43,27 +43,6 @@ Differential Revision: https://phabricator.haskell.org/D5302
4343 create mode 100644 utils/iserv-proxy/iserv-proxy.cabal.in
4444 create mode 100644 utils/iserv/iserv.cabal.in
4545
46−diff --git a/.gitignore b/.gitignore
47−index 7e2425c964..da0254f26a 100644
48−--- a/.gitignore
49−+++ b/.gitignore
50−@@ -153,6 +153,7 @@ _darcs/
51− /libraries/hslogo-16.png
52− /libraries/index-frames.html
53− /libraries/index.html
54−+/libraries/libiserv/libiserv.cabal
55− /libraries/minus.gif
56− /libraries/ocean.css
57− /libraries/plus.gif
58−@@ -178,6 +179,8 @@ _darcs/
59− /testsuite_summary*.txt
60− /testsuite*.xml
61− /testlog*
62−+/utils/iserv/iserv.cabal
63−+/utils/iserv-proxy/iserv-proxy.cabal
64− /utils/mkUserGuidePart/mkUserGuidePart.cabal
65− /utils/runghc/runghc.cabal
66− /utils/gen-dll/gen-dll.cabal
6746diff --git a/configure.ac b/configure.ac
6847index 5fd3441563..d7d8d192a9 100644
6948--- a/configure.ac
overlays/patches/ghc/iserv-cleanup-8.8.1.patch−12
@@ -55,18 +55,6 @@ beforehand; and just have iserv-proxy connect to it)
5555 create mode 100644 utils/remote-iserv/remote-iserv.cabal.in
5656 create mode 100644 utils/remote-iserv/src/Cli.hs
5757
58−diff --git a/.gitignore b/.gitignore
59−index b205b2441e..453f7e3ada 100644
60−--- a/.gitignore
61−+++ b/.gitignore
62−@@ -181,6 +181,7 @@ _darcs/
63− /testlog*
64− /utils/iserv/iserv.cabal
65− /utils/iserv-proxy/iserv-proxy.cabal
66−+/utils/remote-iserv/remote-iserv.cabal
67− /utils/mkUserGuidePart/mkUserGuidePart.cabal
68− /utils/runghc/runghc.cabal
69− /utils/gen-dll/gen-dll.cabal
7058diff --git a/configure.ac b/configure.ac
7159index e4c4b02fb4..434aa4e29c 100644
7260--- a/configure.ac
overlays/patches/ghc/iserv-move-8.4.1.patch−14
@@ -60,20 +60,6 @@ Differential Revision: https://phabricator.haskell.org/D4436
6060 create mode 100644 utils/iserv/iserv.cabal
6161 rename {iserv => utils/iserv}/src/Main.hs (100%)
6262
63−diff --git a/.gitignore b/.gitignore
64−index 67eea8a29f..0d3a3a24d8 100644
65−--- a/.gitignore
66−+++ b/.gitignore
67−@@ -81,8 +81,7 @@ _darcs/
68− /ghc/stage1/
69− /ghc/stage2/
70− /ghc/stage3/
71−-/iserv/stage2*/
72−-/iserv/dist/
73−+/utils/iserv/stage2*/
74−
75− # -----------------------------------------------------------------------------
76− # specific generated files
7763diff --git a/ghc.mk b/ghc.mk
7864index 38c165d261..b7bcc92196 100644
7965--- a/ghc.mk