gnu: haskell: Remove CONFIG_SHELL patches.
A previous commit to the haskell-build-system made sure that if necessary, the CONFIG_SHELL environment variable is set. That obviates the individual patches applied to some packages. Remove them. * gnu/packages/haskell.scm (ghc-network, ghc-old-time, ghc-sdl-image, ghc-sdl-mixer, ghc-sdl, ghc-unix-time, ghc-x11)[arguments]: Remove ‘fix-/bin/sh’ phase.master
parent
554093b7e1
commit
fd59d2ee65
|
@ -865,14 +865,6 @@ OpenAL.")
|
||||||
(base32
|
(base32
|
||||||
"1sa3zx3vrs1gbinxx33zwq0x2bsf3i964bff7419p7vzidn36k46"))))
|
"1sa3zx3vrs1gbinxx33zwq0x2bsf3i964bff7419p7vzidn36k46"))))
|
||||||
(build-system haskell-build-system)
|
(build-system haskell-build-system)
|
||||||
(arguments
|
|
||||||
`(#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
(add-after
|
|
||||||
'unpack 'fix-/bin/sh
|
|
||||||
(lambda _
|
|
||||||
;; Use `sh', not `/bin/sh'.
|
|
||||||
(setenv "CONFIG_SHELL" "sh"))))))
|
|
||||||
(inputs
|
(inputs
|
||||||
`(("sdl" ,sdl)))
|
`(("sdl" ,sdl)))
|
||||||
(home-page "https://hackage.haskell.org/package/SDL")
|
(home-page "https://hackage.haskell.org/package/SDL")
|
||||||
|
@ -903,14 +895,7 @@ award winning Linux port of \"Civilization: Call To Power.\"")
|
||||||
`(#:configure-flags
|
`(#:configure-flags
|
||||||
(let* ((sdl-mixer (assoc-ref %build-inputs "sdl-mixer"))
|
(let* ((sdl-mixer (assoc-ref %build-inputs "sdl-mixer"))
|
||||||
(sdl-mixer-include (string-append sdl-mixer "/include/SDL")))
|
(sdl-mixer-include (string-append sdl-mixer "/include/SDL")))
|
||||||
(list (string-append "--extra-include-dirs=" sdl-mixer-include)))
|
(list (string-append "--extra-include-dirs=" sdl-mixer-include)))))
|
||||||
#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
(add-after
|
|
||||||
'unpack 'fix-/bin/sh
|
|
||||||
(lambda _
|
|
||||||
;; Use `sh', not `/bin/sh'.
|
|
||||||
(setenv "CONFIG_SHELL" "sh"))))))
|
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("ghc-sdl" ,ghc-sdl)))
|
`(("ghc-sdl" ,ghc-sdl)))
|
||||||
(inputs
|
(inputs
|
||||||
|
@ -942,14 +927,7 @@ MIDI, Ogg Vorbis, and SMPEG MP3 libraries.")
|
||||||
`(#:configure-flags
|
`(#:configure-flags
|
||||||
(let* ((sdl-image (assoc-ref %build-inputs "sdl-image"))
|
(let* ((sdl-image (assoc-ref %build-inputs "sdl-image"))
|
||||||
(sdl-image-include (string-append sdl-image "/include/SDL")))
|
(sdl-image-include (string-append sdl-image "/include/SDL")))
|
||||||
(list (string-append "--extra-include-dirs=" sdl-image-include)))
|
(list (string-append "--extra-include-dirs=" sdl-image-include)))))
|
||||||
#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
(add-after
|
|
||||||
'unpack 'fix-/bin/sh
|
|
||||||
(lambda _
|
|
||||||
;; Use `sh', not `/bin/sh'.
|
|
||||||
(setenv "CONFIG_SHELL" "sh"))))))
|
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("ghc-sdl" ,ghc-sdl)))
|
`(("ghc-sdl" ,ghc-sdl)))
|
||||||
(inputs
|
(inputs
|
||||||
|
@ -1216,12 +1194,6 @@ date and time formats.")
|
||||||
(base32
|
(base32
|
||||||
"1h9b26s3kfh2k0ih4383w90ibji6n0iwamxp6rfp2lbq1y5ibjqw"))))
|
"1h9b26s3kfh2k0ih4383w90ibji6n0iwamxp6rfp2lbq1y5ibjqw"))))
|
||||||
(build-system haskell-build-system)
|
(build-system haskell-build-system)
|
||||||
(arguments
|
|
||||||
`(#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
(add-after 'unpack 'fix-/bin/sh
|
|
||||||
(lambda _
|
|
||||||
(setenv "CONFIG_SHELL" "sh"))))))
|
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("ghc-old-locale" ,ghc-old-locale)))
|
`(("ghc-old-locale" ,ghc-old-locale)))
|
||||||
(home-page "http://hackage.haskell.org/package/old-time")
|
(home-page "http://hackage.haskell.org/package/old-time")
|
||||||
|
@ -1433,12 +1405,6 @@ environment variables.")
|
||||||
"X11-" version ".tar.gz"))
|
"X11-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1kzjcynm3rr83ihqx2y2d852jc49da4p18gv6jzm7g87z22x85jj"))))
|
(base32 "1kzjcynm3rr83ihqx2y2d852jc49da4p18gv6jzm7g87z22x85jj"))))
|
||||||
(arguments
|
|
||||||
`(#:phases (modify-phases %standard-phases
|
|
||||||
(add-before 'configure 'set-sh
|
|
||||||
(lambda _
|
|
||||||
(setenv "CONFIG_SHELL" "sh")
|
|
||||||
#t)))))
|
|
||||||
(build-system haskell-build-system)
|
(build-system haskell-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
`(("libx11" ,libx11)
|
`(("libx11" ,libx11)
|
||||||
|
@ -1801,13 +1767,8 @@ but also need those types.")
|
||||||
"0dyvyxwaffb94bgri1wc4b9wqaasy32pyjn0lww3dqblxv8fn5ax"))))
|
"0dyvyxwaffb94bgri1wc4b9wqaasy32pyjn0lww3dqblxv8fn5ax"))))
|
||||||
(build-system haskell-build-system)
|
(build-system haskell-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ; FIXME: Test fails with "System.Time not found". This is
|
`(#:tests? #f)) ; FIXME: Test fails with "System.Time not found". This
|
||||||
; weird, that should be provided by GHC 7.10.2.
|
; is weird, that should be provided by GHC 7.10.2.
|
||||||
#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
(add-after 'unpack 'fix-/bin/sh
|
|
||||||
(lambda _
|
|
||||||
(setenv "CONFIG_SHELL" "sh"))))))
|
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("ghc-old-time" ,ghc-old-time)
|
`(("ghc-old-time" ,ghc-old-time)
|
||||||
("ghc-old-locale" ,ghc-old-locale)))
|
("ghc-old-locale" ,ghc-old-locale)))
|
||||||
|
@ -3162,11 +3123,7 @@ boxed and storable vectors.")
|
||||||
(inputs
|
(inputs
|
||||||
`(("ghc-hunit" ,ghc-hunit)))
|
`(("ghc-hunit" ,ghc-hunit)))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ; FIXME: currently missing libraries used for tests.
|
`(#:tests? #f)) ; FIXME: currently missing libraries used for tests.
|
||||||
#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
(add-before 'configure 'set-sh
|
|
||||||
(lambda _ (setenv "CONFIG_SHELL" "sh"))))))
|
|
||||||
(home-page "https://github.com/haskell/network")
|
(home-page "https://github.com/haskell/network")
|
||||||
(synopsis "Low-level networking interface")
|
(synopsis "Low-level networking interface")
|
||||||
(description
|
(description
|
||||||
|
|
Reference in New Issue