git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
add missing unix patch
8c61239Moritz Angermann
patches/ghc864/default.nix+1
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -3,4 +3,5 @@
3 packages.containers.patches = [ ({ version, revision }: if version == "0.6.0.1" && revision == 0 then ./containers-0.6.0.1.patch else null) ];
3 packages.containers.patches = [ ({ version, revision }: if version == "0.6.0.1" && revision == 0 then ./containers-0.6.0.1.patch else null) ];
4 packages.hpc.patches = [ ({ version, revision }: if version == "0.6.0.3" && revision == 0 then ./hpc-0.6.0.3.patch else null) ];
4 packages.hpc.patches = [ ({ version, revision }: if version == "0.6.0.3" && revision == 0 then ./hpc-0.6.0.3.patch else null) ];
5 packages.parsec.patches = [ ({ version, revision }: if version == "3.1.13.0" && revision == 0 then ./parsec-3.1.13.0.patch else null) ];
5 packages.parsec.patches = [ ({ version, revision }: if version == "3.1.13.0" && revision == 0 then ./parsec-3.1.13.0.patch else null) ];
6+ packages.unix.patches = [ ({ version, revision }: if version == "2.7.2.2" && revision == 0 then ./unix-2.7.2.2.patch else null) ];
6}
7}
patches/ghc864/unix-2.7.2.2.patchnew file+111
@@ -0,0 +1,111 @@
1+diff --git a/configure b/configure
2+index ea0475d..a3897ae 100644
3+--- a/configure
4++++ b/configure
5+@@ -667,7 +667,6 @@ infodir
6+ docdir
7+ oldincludedir
8+ includedir
9+-runstatedir
10+ localstatedir
11+ sharedstatedir
12+ sysconfdir
13+@@ -739,7 +738,6 @@ datadir='${datarootdir}'
14+ sysconfdir='${prefix}/etc'
15+ sharedstatedir='${prefix}/com'
16+ localstatedir='${prefix}/var'
17+-runstatedir='${localstatedir}/run'
18+ includedir='${prefix}/include'
19+ oldincludedir='/usr/include'
20+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
21+@@ -992,15 +990,6 @@ do
22+ | -silent | --silent | --silen | --sile | --sil)
23+ silent=yes ;;
24+
25+- -runstatedir | --runstatedir | --runstatedi | --runstated \
26+- | --runstate | --runstat | --runsta | --runst | --runs \
27+- | --run | --ru | --r)
28+- ac_prev=runstatedir ;;
29+- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
30+- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
31+- | --run=* | --ru=* | --r=*)
32+- runstatedir=$ac_optarg ;;
33+-
34+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
35+ ac_prev=sbindir ;;
36+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
37+@@ -1138,7 +1127,7 @@ fi
38+ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
39+ datadir sysconfdir sharedstatedir localstatedir includedir \
40+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
41+- libdir localedir mandir runstatedir
42++ libdir localedir mandir
43+ do
44+ eval ac_val=\$$ac_var
45+ # Remove trailing slashes.
46+@@ -1291,7 +1280,6 @@ Fine tuning of the installation directories:
47+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
48+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
49+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
50+- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
51+ --libdir=DIR object code libraries [EPREFIX/lib]
52+ --includedir=DIR C header files [PREFIX/include]
53+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
54+@@ -3782,7 +3770,7 @@ else
55+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
56+ since some C++ compilers masquerading as C compilers
57+ incorrectly reject 9223372036854775807. */
58+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
59++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
60+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
61+ && LARGE_OFF_T % 2147483647 == 1)
62+ ? 1 : -1];
63+@@ -3828,7 +3816,7 @@ else
64+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
65+ since some C++ compilers masquerading as C compilers
66+ incorrectly reject 9223372036854775807. */
67+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
68++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
69+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
70+ && LARGE_OFF_T % 2147483647 == 1)
71+ ? 1 : -1];
72+@@ -3852,7 +3840,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
73+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
74+ since some C++ compilers masquerading as C compilers
75+ incorrectly reject 9223372036854775807. */
76+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
77++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
78+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
79+ && LARGE_OFF_T % 2147483647 == 1)
80+ ? 1 : -1];
81+@@ -3897,7 +3885,7 @@ else
82+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
83+ since some C++ compilers masquerading as C compilers
84+ incorrectly reject 9223372036854775807. */
85+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
86++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
87+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
88+ && LARGE_OFF_T % 2147483647 == 1)
89+ ? 1 : -1];
90+@@ -3921,7 +3909,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
91+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
92+ since some C++ compilers masquerading as C compilers
93+ incorrectly reject 9223372036854775807. */
94+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
95++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
96+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
97+ && LARGE_OFF_T % 2147483647 == 1)
98+ ? 1 : -1];
99+diff --git a/unix.cabal b/unix.cabal
100+index cf44068..bb3155f 100644
101+--- a/unix.cabal
102++++ b/unix.cabal
103+@@ -62,7 +62,7 @@ library
104+ buildable: False
105+
106+ build-depends:
107+- base >= 4.5 && < 4.11,
108++ base >= 4.5 && < 4.13,
109+ bytestring >= 0.9.2 && < 0.11,
110+ time >= 1.2 && < 1.9
111+