Skip to content

Commit df999f6

Browse files
committed
Fix formatting in generated .nix-bootstrap.dhall to match dhall format's spec
1 parent e4d5a83 commit df999f6

File tree

7 files changed

+5
-7
lines changed

7 files changed

+5
-7
lines changed

.last-exported-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Last exported commit from parent repo: 6e1a9fb95f60bf61718a21d486bd69bca7dda9e8
1+
Last exported commit from parent repo: e608d124ce3fd1cfa55f1d6b14306d89a66991ad

.nix-bootstrap.dhall

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
-- This file was generated by nix-bootstrap.
22
-- It should be checked into version control.
33
-- It is used to aid migration between nix-bootstrap versions and preserve idempotence.
4-
54
let NodePackageManager = < NPM | PNPm | Yarn >
65

76
let ElmMode = < Bare | Node : NodePackageManager >

flake.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
++ (
6969
with nixpkgs; [
7070
coreutils
71+
dhall
7172
glab
7273
gnused
7374
gnutar

nix-bootstrap.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cabal-version: 2.0
55
-- see: https://github.com/sol/hpack
66

77
name: nix-bootstrap
8-
version: 2.0.0.3
8+
version: 2.0.0.4
99
author: gchquser
1010
maintainer: [email protected]
1111
copyright: Crown Copyright

package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
name: nix-bootstrap
15-
version: 2.0.0.3
15+
version: 2.0.0.4
1616
author: gchquser
1717
maintainer: [email protected]
1818
copyright: Crown Copyright

src/Bootstrap/Data/Config/Internal.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,7 @@ instance Bootstrappable Config where
172172
unlines
173173
[ "-- This file was generated by nix-bootstrap.",
174174
"-- It should be checked into version control.",
175-
"-- It is used to aid migration between nix-bootstrap versions and preserve idempotence.",
176-
""
175+
"-- It is used to aid migration between nix-bootstrap versions and preserve idempotence."
177176
]
178177
extractUnions :: Expr Src Void -> Expr Src Void
179178
extractUnions e =

test/Bootstrap/Data/Config/InternalSpec.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ spec = describe ".nix-bootstrap.dhall rendering" do
3535
[r|-- This file was generated by nix-bootstrap.
3636
-- It should be checked into version control.
3737
-- It is used to aid migration between nix-bootstrap versions and preserve idempotence.
38-
3938
let NodePackageManager = < NPM | PNPm | Yarn >
4039

4140
let ElmMode = < Bare | Node : NodePackageManager >

0 commit comments

Comments
 (0)