cpkg 0.1.1.0 → 0.1.1.1
raw patch · 7 files changed
+32/−19 lines, 7 filesdep ~libarchivePVP ok
version bump matches the API change (PVP)
Dependency ranges changed: libarchive
API changes (from Hackage documentation)
Files
- CHANGELOG.md +4/−0
- README.md +4/−4
- cpkg.cabal +2/−2
- dhall/cpkg-prelude.dhall +1/−1
- pkgs/pkg-set.dhall +19/−9
- src/Package/C/Build/OS.hs +1/−2
- src/Package/C/Unpack.hs +1/−1
CHANGELOG.md view
@@ -1,5 +1,9 @@ # cpkg +## 0.1.1.1++ * Stream using `libarchive` lazily+ ## 0.1.1.0 * Export `EnvVar`
README.md view
@@ -258,11 +258,11 @@ Bash 3 43 35 3 5 Cabal 1 154 140 0 14 Cabal Project 1 2 2 0 0- Dhall 3 4531 4073 0 458- Haskell 31 1707 1395 29 283- Markdown 3 461 391 0 70+ Dhall 3 4541 4080 0 461+ Haskell 31 1706 1394 29 283+ Markdown 3 468 396 0 72 YAML 4 156 141 0 15 -------------------------------------------------------------------------------- Total 46 7054 6177 32 845+ Total 46 7070 6188 32 850 ------------------------------------------------------------------------------- ```
cpkg.cabal view
@@ -1,6 +1,6 @@ cabal-version: 1.18 name: cpkg-version: 0.1.1.0+version: 0.1.1.1 license: BSD3 license-file: LICENSE copyright: Copyright: (c) 2018-2019 Vanessa McHale@@ -94,7 +94,7 @@ filemanip -any, network-uri -any, megaparsec -any,- libarchive -any+ libarchive >=1.0.4.0 if (flag(development) && impl(ghc <=8.2)) ghc-options: -Werror
dhall/cpkg-prelude.dhall view
@@ -1,5 +1,5 @@ {- Dhall prelude imports -}-let concatMapSep = https://raw.githubusercontent.com/dhall-lang/dhall-lang/master/Prelude/Text/concatMapSep+let concatMapSep = https://raw.githubusercontent.com/dhall-lang/dhall-lang/0a7f596d03b3ea760a96a8e03935f4baa64274e1/Prelude/Text/concatMapSep in let concatMapText = https://raw.githubusercontent.com/dhall-lang/dhall-lang/master/Prelude/Text/concatMap
pkgs/pkg-set.dhall view
@@ -1,5 +1,5 @@ {- Dhall prelue imports -}-let concatMapSep = https://raw.githubusercontent.com/dhall-lang/dhall-lang/master/Prelude/Text/concatMapSep+let concatMapSep = https://raw.githubusercontent.com/dhall-lang/dhall-lang/0a7f596d03b3ea760a96a8e03935f4baa64274e1/Prelude/Text/concatMapSep in {- cpkg prelude imports -}@@ -2606,9 +2606,8 @@ , prelude.lowerBound { name = "glproto", lower = [1,4,14] } , prelude.lowerBound { name = "dri2proto", lower = [2,8] } , prelude.unbounded "libXrandr"- , prelude.unbounded "llvm" ]- -- , configureCommand = prelude.configureWithFlags [ "--with-gallium-drivers=nouveau,swrast" ] -- disable radeon drivers so we don't need LLVM+ , configureCommand = prelude.configureWithFlags [ "--with-gallium-drivers=nouveau,swrast" ] -- disable radeon drivers so we don't need LLVM (7.0.1 won't work?) } in @@ -3017,11 +3016,22 @@ let llvm = λ(v : List Natural) →+ let llvmBuild =+ λ(cfg : types.BuildVars) →+ [ prelude.call { program = "cmake"+ , arguments = [ "--build", ".", "--config", "Release", "--", "-j", "3" ]+ , environment = prelude.defaultEnv+ , procDir = Some "build"+ }+ ]+ in+ let versionString = prelude.showVersion v in prelude.simplePackage { name = "llvm", version = v } ⫽ prelude.cmakePackage ⫽ { pkgUrl = "http://releases.llvm.org/${versionString}/llvm-${versionString}.src.tar.xz" , pkgSubdir = "llvm-${versionString}.src" , pkgStream = False+ , buildCommand = llvmBuild } in @@ -3076,8 +3086,8 @@ , gmp [6,1,2] , gobject-introspection { version = [1,59], patch = 3 } , gnome-doc-utils { version = [0,20], patch = 10 }-, gnupg [2,2,13]-, gnutls { version = [3,6], patch = 6 }+, gnupg [2,2,15]+, gnutls { version = [3,6], patch = 7 } , graphviz [2,40,1] , gsl [2,5] , gtk2 { version = [2,24], patch = 32 }@@ -3170,7 +3180,7 @@ , markupSafe [1,0] , memcached [1,5,12] , mesa [18,3,1]-, meson [0,49,2]+, meson [0,50,0] , mpfr [4,0,2] , mosh [1,3,2] , motif [2,3,8]@@ -3193,12 +3203,12 @@ , pixman [0,36,0] , pkg-config [0,29,2] , postgresql [11,1]-, protobuf [3,7,0]+, protobuf [3,7,1] , pycairo [1,18,0] , pygobject { version = [2,28], patch = 7 } , pygtk { version = [2,24], patch = 0 }-, python [2,7,15]-, python [3,7,2]+, python [2,7,16]+, python [3,7,3] , qrencode [4,0,2] , ragel [6,10] , randrproto [1,5,0]
src/Package/C/Build/OS.hs view
@@ -2,8 +2,7 @@ , dhallArch ) where -import Package.C.Triple.Type hiding (arch, os)-import Package.C.Type.Shared+import Package.C.Triple.Type hiding (arch, os) import System.Info (arch, os) dhallArch :: Arch
src/Package/C/Unpack.hs view
@@ -29,7 +29,7 @@ archiveResponse :: TarCompress -> FilePath -> BSL.ByteString -> IO () archiveResponse compressScheme dirName =- Archive.unpackToDir dirName . BSL.toStrict . getCompressor compressScheme+ Archive.unpackToDirLazy dirName . getCompressor compressScheme tarResponse :: TarCompress -> FilePath -> BSL.ByteString -> IO () tarResponse compressScheme dirName =