packages feed

cpkg 0.2.5.2 → 0.2.5.3

raw patch · 3 files changed

+14/−8 lines, 3 files

Files

cpkg.cabal view
@@ -1,6 +1,6 @@ cabal-version:      1.18 name:               cpkg-version:            0.2.5.2+version:            0.2.5.3 license:            BSD3 license-file:       LICENSE copyright:          Copyright: (c) 2018-2020 Vanessa McHale
pkgs/pkg-set.dhall view
@@ -490,7 +490,7 @@                                                      (prelude.osCfg cfg)}"                              in    prelude.installWithBinaries-                                    [ "bin/perl", "bin/cpan" ]+                                    [ "bin/perl", "bin/cpan", "bin/ptar" ]                                     cfg                                 # [ prelude.symlink                                       "lib/${prelude.showVersion@@ -4143,7 +4143,7 @@          in    prelude.simplePackage { name = "r", version = v }             ⫽ { pkgUrl =-                  "https://cran.r-project.org/src/base/R-3/R-${versionString}.tar.gz"+                  "https://cran.r-project.org/src/base/R-4/R-${versionString}.tar.gz"               , pkgSubdir = "R-${versionString}"               , pkgDeps =                 [ prelude.unbounded "readline"@@ -4695,6 +4695,12 @@                     [ { file = "opt/schily/share/man/man1/smake.1"                       , section = 1                       }+                    , { file = "opt/schily/share/man/man5/makefiles.5"+                      , section = 5+                      }+                    , { file = "opt/schily/share/man/man5/makerules.5"+                      , section = 5+                      }                     ]           } @@ -4798,13 +4804,13 @@     , gdb [ 8, 3, 1 ]     , gdk-pixbuf { version = [ 2, 38 ], patch = 1 }     , gegl { version = [ 0, 4 ], patch = 16 }-    , gettext [ 0, 20, 1 ]+    , gettext [ 0, 20, 2 ]     , gexiv2 { version = [ 0, 12 ], patch = 0 }     , ghc [ 8, 8, 3 ]     , gperf [ 3, 1 ]     , gperftools [ 2, 7 ]     , giflib [ 5, 1, 4 ]-    , git [ 2, 26, 1 ]+    , git [ 2, 26, 2 ]     , glib { version = [ 2, 64 ], patch = 2 }     , glib-networking { version = [ 2, 61 ], patch = 2 }     , glproto [ 1, 4, 17 ]@@ -4975,7 +4981,7 @@     , qrencode [ 4, 0, 2 ]     , qt { version = [ 5, 13 ], patch = 0 }     , quazip [ 0, 8, 1 ]-    , r [ 3, 6, 2 ]+    , r [ 4, 0, 0 ]     , ragel [ 6, 10 ]     , randrproto [ 1, 5, 0 ]     , re2c [ 1, 1, 1 ]
src/Package/C/PackageSet.hs view
@@ -24,11 +24,11 @@ import           Package.C.Type.Tree  defaultPackageSetHash :: T.Text-defaultPackageSetHash = "sha256:7c3a18e547cd653fcaf7730043ab13a2f52aa490ca37f97b328d7043f756c22a"+defaultPackageSetHash = "sha256:93cbf84fb5e9d7b9419c156145b5c91be8e1800c36c9641b7c8513f4213b6f2b"  defaultPackageSetDhall :: Maybe String -> IO PackageSetDhall defaultPackageSetDhall (Just pkSet) = input auto (T.pack pkSet)-defaultPackageSetDhall Nothing      = input auto ("https://raw.githubusercontent.com/vmchale/cpkg/70ee800f7139ad212e7f9b5c0329bd0cfefb0c69/pkgs/pkg-set.dhall " <> defaultPackageSetHash)+defaultPackageSetDhall Nothing      = input auto ("https://raw.githubusercontent.com/vmchale/cpkg/776390d3ae9041a6b343ab5321b8486d3947e040/pkgs/pkg-set.dhall " <> defaultPackageSetHash)   displayPackageSet :: Maybe String -> IO ()