cpkg 0.2.5.3 → 0.2.5.4
raw patch · 4 files changed
+12/−13 lines, 4 files
Files
- cpkg.cabal +1/−1
- dhall/cpkg-prelude.dhall +1/−1
- pkgs/pkg-set.dhall +8/−9
- src/Package/C/PackageSet.hs +2/−2
cpkg.cabal view
@@ -1,6 +1,6 @@ cabal-version: 1.18 name: cpkg-version: 0.2.5.3+version: 0.2.5.4 license: BSD3 license-file: LICENSE copyright: Copyright: (c) 2018-2020 Vanessa McHale
dhall/cpkg-prelude.dhall view
@@ -564,7 +564,7 @@ λ(pkg : { name : Text, version : List Natural }) → simplePackage pkg ⫽ { pkgUrl =- "https://ftp.wayne.edu/gnu/${pkg.name}/${pkg.name}-${showVersion+ "https://ftp.gnu.org/gnu/${pkg.name}/${pkg.name}-${showVersion pkg.version}.tar.xz" , installCommand = installWithBinaries [ "bin/${pkg.name}" ] }
pkgs/pkg-set.dhall view
@@ -70,7 +70,7 @@ → prelude.makeGnuExe { name = "binutils", version = v } ⫽ { pkgUrl = "https://ftp.wayne.edu/gnu/binutils/binutils-${prelude.showVersion- v}.tar.xz"+ v}.tar.lz" , installCommand = prelude.installWithBinaries [ "bin/ar"@@ -378,8 +378,8 @@ λ(v : List Natural) → prelude.simplePackage { name = "ncurses", version = v } ⫽ { pkgUrl =- "https://ftp.wayne.edu/gnu/ncurses/ncurses-${prelude.showVersion- v}.tar.gz"+ "https://ftp.gnu.org/gnu/ncurses/ncurses-${prelude.showVersion+ v}.tar.gz" , configureCommand = λ(cfg : types.BuildVars) → let crossArgs =@@ -1140,7 +1140,6 @@ ⫽ { pkgUrl = "https://ftp.gnu.org/gnu/readline/readline-${prelude.showVersion v}.tar.gz"- , pkgBuildDeps = [ prelude.unbounded "make" ] } let pixman =@@ -3682,7 +3681,7 @@ in prelude.simplePackage { name = "gcc", version = v } ⫽ { pkgUrl =- "https://ftp.wayne.edu/gnu/gcc/gcc-${versionString}/gcc-${versionString}.tar.xz"+ "https://ftp.gnu.org/gnu/gcc/gcc-${versionString}/gcc-${versionString}.tar.xz" , configureCommand = λ(cfg : types.BuildVars) → [ prelude.call@@ -4757,7 +4756,7 @@ , autoconf [ 2, 69 ] , automake [ 1, 16, 2 ] , babl { version = [ 0, 1 ], patch = 68 }- , bash [ 5, 0, 16 ]+ , bash [ 5, 0, 17 ] , bash-completion [ 2, 9 ] , binutils [ 2, 33, 1 ] , bison [ 3, 5 ]@@ -4769,7 +4768,7 @@ , cimg [ 2, 7, 0 ] , clang [ 9, 0, 0 ] , clzip [ 1, 11 ]- , cmake { version = [ 3, 17 ], patch = 1 }+ , cmake { version = [ 3, 17 ], patch = 2 } , cmark [ 0, 29, 0 ] , compositeproto [ 0, 4 ] , coreutils [ 8, 31 ]@@ -4800,7 +4799,7 @@ , fribidi [ 1, 0, 9 ] , gawk [ 5, 0, 1 ] , gc [ 8, 0, 4 ]- , gcc [ 9, 3, 0 ]+ , gcc [ 10, 1, 0 ] , gdb [ 8, 3, 1 ] , gdk-pixbuf { version = [ 2, 38 ], patch = 1 } , gegl { version = [ 0, 4 ], patch = 16 }@@ -4880,7 +4879,7 @@ , libpsl [ 0, 21, 0 ] , libpthread-stubs [ 0, 4 ] , libraw [ 0, 19, 2 ]- , librsvg { version = [ 2, 48 ], patch = 3 }+ , librsvg { version = [ 2, 48 ], patch = 4 } , libsamplerate [ 0, 1, 9 ] , libsass [ 3, 6, 2 ] , libselinux [ 3, 0 ]
src/Package/C/PackageSet.hs view
@@ -24,11 +24,11 @@ import Package.C.Type.Tree defaultPackageSetHash :: T.Text-defaultPackageSetHash = "sha256:93cbf84fb5e9d7b9419c156145b5c91be8e1800c36c9641b7c8513f4213b6f2b"+defaultPackageSetHash = "sha256:4e933beb267d7c5b55afca08137f204f3555ef82a5763c617782026fc2898fde" defaultPackageSetDhall :: Maybe String -> IO PackageSetDhall defaultPackageSetDhall (Just pkSet) = input auto (T.pack pkSet)-defaultPackageSetDhall Nothing = input auto ("https://raw.githubusercontent.com/vmchale/cpkg/776390d3ae9041a6b343ab5321b8486d3947e040/pkgs/pkg-set.dhall " <> defaultPackageSetHash)+defaultPackageSetDhall Nothing = input auto ("https://raw.githubusercontent.com/vmchale/cpkg/80d61a9f060f5b950e72f4d30a4c51b83bb2d729/pkgs/pkg-set.dhall " <> defaultPackageSetHash) displayPackageSet :: Maybe String -> IO ()