cpkg 0.2.5.1 → 0.2.5.2
raw patch · 4 files changed
+28/−14 lines, 4 files
Files
- cpkg.cabal +1/−1
- dhall/cpkg-prelude.dhall +3/−3
- pkgs/pkg-set.dhall +22/−8
- src/Package/C/PackageSet.hs +2/−2
cpkg.cabal view
@@ -1,6 +1,6 @@ cabal-version: 1.18 name: cpkg-version: 0.2.5.1+version: 0.2.5.2 license: BSD3 license-file: LICENSE copyright: Copyright: (c) 2018-2020 Vanessa McHale
dhall/cpkg-prelude.dhall view
@@ -388,7 +388,7 @@ , libPath cfg , mkLDRunPath cfg.linkDirs , mkPerlLib- { libDirs = cfg.linkDirs, perlVersion = [ 5, 30, 1 ], cfg }+ { libDirs = cfg.linkDirs, perlVersion = [ 5, 30, 2 ], cfg } ] let buildEnv =@@ -396,7 +396,7 @@ → defaultPath cfg # [ mkPkgConfigVar (cfg.shareDirs # cfg.linkDirs) , mkPerlLib- { libDirs = cfg.linkDirs, perlVersion = [ 5, 30, 1 ], cfg }+ { libDirs = cfg.linkDirs, perlVersion = [ 5, 30, 2 ], cfg } , mkLDPath cfg.linkDirs , mkLDFlagsGeneral cfg.linkDirs ([] : List Text) cfg ]@@ -1081,7 +1081,7 @@ , mkXdgDataDirs cfg.shareDirs , mkLDPreload cfg.preloadLibs , mkPerlLib- { libDirs = cfg.linkDirs, perlVersion = [ 5, 30, 1 ], cfg }+ { libDirs = cfg.linkDirs, perlVersion = [ 5, 30, 2 ], cfg } ] )
pkgs/pkg-set.dhall view
@@ -4728,6 +4728,19 @@ ] } +let tarlz =+ λ(v : List Natural)+ → prelude.simplePackage { name = "tarlz", version = v }+ ⫽ { pkgUrl =+ "http://download.savannah.gnu.org/releases/lzip/tarlz/tarlz-${prelude.showVersion+ v}.tar.lz"+ , installCommand =+ λ(cfg : types.BuildVars)+ → prelude.installWithBinaries [ "bin/tarlz" ] cfg+ # prelude.symlinkManpages+ [ { file = "share/man/man1/tarlz.1", section = 1 } ]+ }+ in [ alsa-lib [ 1, 1, 9 ] , apr [ 1, 7, 0 ] , apr-util [ 1, 6, 1 ]@@ -4750,7 +4763,7 @@ , cimg [ 2, 7, 0 ] , clang [ 9, 0, 0 ] , clzip [ 1, 11 ]- , cmake { version = [ 3, 17 ], patch = 0 }+ , cmake { version = [ 3, 17 ], patch = 1 } , cmark [ 0, 29, 0 ] , compositeproto [ 0, 4 ] , coreutils [ 8, 31 ]@@ -4791,8 +4804,8 @@ , gperf [ 3, 1 ] , gperftools [ 2, 7 ] , giflib [ 5, 1, 4 ]- , git [ 2, 26, 0 ]- , glib { version = [ 2, 64 ], patch = 1 }+ , git [ 2, 26, 1 ]+ , glib { version = [ 2, 64 ], patch = 2 } , glib-networking { version = [ 2, 61 ], patch = 2 } , glproto [ 1, 4, 17 ] , glu [ 9, 0, 0 ]@@ -4802,12 +4815,12 @@ , gobject-introspection { version = [ 1, 62 ], patch = 0 } , gnome-doc-utils { version = [ 0, 20 ], patch = 10 } , gnupg [ 2, 2, 20 ]- , gnutls { version = [ 3, 6 ], patch = [ 11, 1 ] }+ , gnutls { version = [ 3, 6 ], patch = [ 13 ] } , graphviz [ 2, 40, 1 ] , grep [ 3, 3 ] , gsl [ 2, 6 ] , gtk2 { version = [ 2, 24 ], patch = 32 }- , gtk3 { version = [ 3, 24 ], patch = 14 }+ , gtk3 { version = [ 3, 24 ], patch = 18 } , gzip [ 1, 10 ] , harfbuzz [ 2, 6, 4 ] , htop [ 2, 2, 0 ]@@ -4861,7 +4874,7 @@ , libpsl [ 0, 21, 0 ] , libpthread-stubs [ 0, 4 ] , libraw [ 0, 19, 2 ]- , librsvg { version = [ 2, 48 ], patch = 2 }+ , librsvg { version = [ 2, 48 ], patch = 3 } , libsamplerate [ 0, 1, 9 ] , libsass [ 3, 6, 2 ] , libselinux [ 3, 0 ]@@ -4933,7 +4946,7 @@ , ncurses [ 6, 2 ] , nginx [ 1, 15, 7 ] , ninja [ 1, 9, 0 ]- , node [ 12, 13, 0 ]+ , node [ 12, 16, 2 ] , npth [ 1, 6 ] , nspr [ 4, 20 ] , openblas [ 0, 3, 2 ]@@ -4947,7 +4960,7 @@ , pcre [ 8, 44 ] , pcre2 [ 10, 33 ] , pdfgrep [ 2, 1, 2 ]- , perl5 [ 5, 30, 1 ]+ , perl5 [ 5, 30, 2 ] , phash [ 0, 9, 6 ] , pixman [ 0, 38, 4 ] , pkg-config [ 0, 29, 2 ]@@ -4983,6 +4996,7 @@ , swig [ 3, 0, 12 ] , swi-prolog [ 8, 0, 3 ] , tar [ 1, 32 ]+ , tarlz [ 0, 16 ] , tcc [ 0, 9, 27 ] , texinfo [ 6, 6 ] , tesseract [ 4, 0, 0 ]
src/Package/C/PackageSet.hs view
@@ -24,11 +24,11 @@ import Package.C.Type.Tree defaultPackageSetHash :: T.Text-defaultPackageSetHash = "sha256:59490322eb6249d94698473eb9be6e29dce0519f058914e2cb42b30e030596d9"+defaultPackageSetHash = "sha256:7c3a18e547cd653fcaf7730043ab13a2f52aa490ca37f97b328d7043f756c22a" defaultPackageSetDhall :: Maybe String -> IO PackageSetDhall defaultPackageSetDhall (Just pkSet) = input auto (T.pack pkSet)-defaultPackageSetDhall Nothing = input auto ("https://raw.githubusercontent.com/vmchale/cpkg/e90b4b5350f8a7b82ae871d074526c15fd47f6db/pkgs/pkg-set.dhall " <> defaultPackageSetHash)+defaultPackageSetDhall Nothing = input auto ("https://raw.githubusercontent.com/vmchale/cpkg/70ee800f7139ad212e7f9b5c0329bd0cfefb0c69/pkgs/pkg-set.dhall " <> defaultPackageSetHash) displayPackageSet :: Maybe String -> IO ()