b9 1.0.0 → 1.0.1
raw patch · 9 files changed
+25/−48 lines, 9 filesdep −dhall
Dependencies removed: dhall
Files
- .travis.yml +0/−2
- CHANGELOG.md +12/−0
- README.md +4/−4
- b9.cabal +3/−9
- prepare_release.sh +0/−17
- src/lib/B9/B9Config.hs +3/−3
- src/lib/B9/Shake/SharedImageRules.hs +1/−1
- src/tests/B9/Content/ErlTermsSpec.hs +2/−2
- stack.yaml +0/−10
− .travis.yml
@@ -1,2 +0,0 @@-language: nix-script: nix-build
CHANGELOG.md view
@@ -1,5 +1,17 @@ # Changelog for B9 +## 1.0.1++* Remove dhall+* Cleanup `b9.cabal`+* Replace `fail` with `error`++## 1.0.0++* Add `SystemdNspawn` support+* Improve command execution+* Improve nix build expressions+ ## 0.5.69.0 * Add new `ImageResize` option `ShrinkToMinimumAndIncrease`
README.md view
@@ -1,6 +1,6 @@ # B9 - A Benign VM-Build Tool [](CHANGELOG.md) -[](https://travis-ci.org/sheyll/b9-vm-image-builder) [](http://hackage.haskell.org/package/b9)+[](https://travis-ci.org/sheyll/b9-vm-image-builder) [](http://hackage.haskell.org/package/b9) **NOTE: The feature list is not completely implemented yet!** @@ -74,11 +74,11 @@ * systemd -#### For `Podman` support+#### For `Podman` support (TODO) * podman -#### For `Docker` support+#### For `Docker` support (TODO) * docker @@ -177,7 +177,7 @@ The input files can be in: -* DHALL format+* Dhall format **TODO** * Haskell values interpreted by the `Read` instances. ### Usage as Library
b9.cabal view
@@ -1,6 +1,6 @@ cabal-version: 2.4 name: b9-version: 1.0.0+version: 1.0.1 synopsis: A tool and library for building virtual machine images. @@ -46,17 +46,11 @@ maintainer: svh@posteo.de homepage: https://github.com/sheyll/b9-vm-image-builder bug-reports: https://github.com/sheyll/b9-vm-image-builder/issues-copyright: 2015, 2016, 2017, 2018, 2019 Sven Heyll <svh@posteo.de>+copyright: 2015, 2016, 2017, 2018, 2019, 2020 Sven Heyll <svh@posteo.de> category: Development build-type: Simple extra-source-files: README.md- , LICENSE- , Setup.hs- , b9.cabal , .gitignore- , prepare_release.sh- , stack.yaml- , .travis.yml , CONTRIBUTORS , CONTRIBUTING.md , CODE_OF_CONDUCT.md@@ -165,7 +159,7 @@ , boxes >= 0.1.4 , conduit >= 1.2 , conduit-extra >= 1.1- , dhall >= 1+ -- , dhall >= 1 TODO , exceptions >= 0.10 , filepath >= 1.4 , free >= 4.12
− prepare_release.sh
@@ -1,17 +0,0 @@-#!/usr/bin/env bash-#-# Prepare B9 for release:-# * clean the workspace-# * install the dependencies-# * check that the project compiles-# * run all tests-# * build documentation-#-set -eu--stack clean-stack build-stack test-stack haddock-stack sdist-
src/lib/B9/B9Config.hs view
@@ -309,10 +309,10 @@ putStrLn ("creating a new config file with defaults at: " ++ c) return c Nothing ->- fail "Please provide a valid config file path."+ error "Please provide a valid config file path." cp <- openOrCreateB9Config cfgPath case parseB9Config cp of- Left e -> fail (printf "Internal configuration load error, please report this: %s\n" (show e))+ Left e -> error (printf "Internal configuration load error, please report this: %s\n" (show e)) Right permanentConfigIn -> do let runtimeCfg = appEndo (cfg ^. customB9Config) permanentConfigIn (res, permanentB9ConfigUpdates) <-@@ -325,7 +325,7 @@ cpExt <- maybe (return Nothing)- (either (fail . printf "Internal configuration update error! Please report this: %s\n" . show) (return . Just))+ (either (error . printf "Internal configuration update error! Please report this: %s\n" . show) (return . Just)) cpExtErr mapM_ (writeB9CPDocument (cfg ^. customB9ConfigPath)) cpExt return res
@@ -95,4 +95,4 @@ deriving (Typeable) errorSharedImageNotFound :: (HasCallStack, Monad m) => SharedImageName -> m a-errorSharedImageNotFound = fail . printf "Error: %s not found." . show+errorSharedImageNotFound = error . printf "Error: %s not found." . show
src/tests/B9/Content/ErlTermsSpec.hs view
@@ -61,8 +61,8 @@ let decimalStr = unsafeRenderToText (show (decimal :: Integer) ++ ".") parsedTerm <- case parseErlTerm "test" decimalStr of- (Left e) -> fail e- (Right parsedTerm) -> return parsedTerm+ Left e -> error e+ Right parsedTerm -> return parsedTerm return (ErlNatural decimal == parsedTerm) ) )
− stack.yaml
@@ -1,10 +0,0 @@-flags: {}-packages:-- '.'-extra-deps:-- ConfigFile-1.1.4-- template-0.2.0.10-- extensible-effects-5.0.0.1--resolver: lts-14.7-require-stack-version: ">=1.6.5"