Merge pull request #290 from expipiplus1/warnings

Squash warning in utils

nix/nixpkgs.nix

@@ -1,8 +1,8 @@
 let
   nixpkgsSrc = builtins.fetchTarball {
     url =
-      "https://github.com/nixos/nixpkgs/archive/1c2986bbb806c57f9470bf3231d8da7250ab9091.tar.gz"; # refs/heads/nixos-unstable
-    sha256 = "0y1275nzlmsys5rk7ivzbdc8cpjs9cbk0wz6yh3i2c57b8nbd3ym";
+      "https://github.com/nixos/nixpkgs/archive/fbfb79400a08bf754e32b4d4fc3f7d8f8055cf94.tar.gz"; # refs/heads/nixos-unstable
+    sha256 = "0pgyx1l1gj33g5i9kwjar7dc3sal2g14mhfljcajj8bqzzrbc3za";
   };
 
 in import nixpkgsSrc { }

readme.md

@@ -2,6 +2,9 @@
 
 Slightly high level Haskell bindings to the Vulkan graphics API.
 
+Join us on Matrix at
+[#vulkan:monoid.al](https://matrix.to/#/#vulkan:monoid.al?via=monoid.al&via=matrix.org&via=nordgedanken.dev)
+
 These bindings present an interface to Vulkan which looks like more idiomatic
 Haskell and which is much less verbose than the C API. Nevertheless, it retains
 access to all the functionality. If you find something you can do in the C

utils/changelog.md

@@ -2,6 +2,9 @@
 
 ## WIP
 
+## [0.5.0.1] - 2021-06-09
+- Squash warning
+
 ## [0.5.0] - 2021-02-24
 - Refactor module `Vulkan.Utils.ShaderQQ`
   - Remove `Vulkan.Utils.ShaderQQ`

utils/package.yaml

@@ -1,92 +1,99 @@
 name: vulkan-utils
-version: "0.5.0"
+version: 0.5.0.1
 synopsis: Utils for the vulkan package
 category: Graphics
 maintainer: Joe Hermaszewski <[email protected]>
 github: expipiplus1/vulkan
 extra-source-files:
-  - readme.md
-  - changelog.md
-  - package.yaml
-  - src/Vulkan/Utils/gl_enums.h
+- readme.md
+- changelog.md
+- package.yaml
+- src/Vulkan/Utils/gl_enums.h
 
 library:
   source-dirs: src
   c-sources: cbits/DebugCallback.c
   other-modules:
-    - Vulkan.Utils.Internal
+  - Vulkan.Utils.Internal
+  - Vulkan.Utils.ShaderQQ.ShaderType
+  - Vulkan.Utils.ShaderQQ.Backend.Internal
+  - Vulkan.Utils.ShaderQQ.Backend.Glslang.Internal
+  - Vulkan.Utils.ShaderQQ.Backend.Shaderc.Internal
+  - Vulkan.Utils.ShaderQQ.GLSL
+  - Vulkan.Utils.ShaderQQ.HLSL
+
   dependencies:
-    - base <5
-    - bytestring
-    - containers
-    - dependent-map
-    - dependent-sum
-    - extra
-    - file-embed
-    - filepath
-    - resourcet >= 1.2.4
-    - template-haskell
-    - temporary
-    - text
-    - transformers
-    - typed-process
-    - unordered-containers
-    - vector
-    - vulkan >= 3.6.14 && < 3.11
+  - base <5
+  - bytestring
+  - containers
+  - dependent-map
+  - dependent-sum
+  - extra
+  - file-embed
+  - filepath
+  - resourcet >= 1.2.4
+  - template-haskell
+  - temporary
+  - text
+  - transformers
+  - typed-process
+  - unordered-containers
+  - vector
+  - vulkan >= 3.6.14 && < 3.11
 
 tests:
   doctests:
     main: Doctests.hs
-    other-modules: ""
+    other-modules: ''
     source-dirs:
-      - test/doctest
+    - test/doctest
     dependencies:
-      - base
-      - doctest
-      - vulkan-utils
+    - base
+    - doctest
+    - vulkan-utils
 
 custom-setup:
   dependencies:
-    - base
-    - Cabal
-    - cabal-doctest >= 1 && <1.1
+  - base
+  - Cabal
+  - cabal-doctest >= 1 && <1.1
 
 ghc-options:
-  - -Wall
+- -Wall
 
 default-extensions:
-  - ConstraintKinds
-  - DataKinds
-  - DefaultSignatures
-  - DeriveAnyClass
-  - DeriveFoldable
-  - DeriveFunctor
-  - DeriveTraversable
-  - DerivingStrategies
-  - DuplicateRecordFields
-  - FlexibleContexts
-  - FlexibleInstances
-  - GADTs
-  - GeneralizedNewtypeDeriving
-  - InstanceSigs
-  - LambdaCase
-  - MagicHash
-  - NamedFieldPuns
-  - NoMonomorphismRestriction
-  - OverloadedStrings
-  - PartialTypeSignatures
-  - PatternSynonyms
-  - PolyKinds
-  - QuantifiedConstraints
-  - RankNTypes
-  - RecordWildCards
-  - RoleAnnotations
-  - ScopedTypeVariables
-  - StandaloneDeriving
-  - Strict
-  - TupleSections
-  - TypeApplications
-  - TypeFamilyDependencies
-  - TypeOperators
-  - TypeSynonymInstances
-  - ViewPatterns
+- ConstraintKinds
+- DataKinds
+- DefaultSignatures
+- DeriveAnyClass
+- DeriveFoldable
+- DeriveFunctor
+- DeriveTraversable
+- DerivingStrategies
+- DuplicateRecordFields
+- FlexibleContexts
+- FlexibleInstances
+- GADTs
+- GeneralizedNewtypeDeriving
+- InstanceSigs
+- LambdaCase
+- MagicHash
+- NamedFieldPuns
+- NoMonomorphismRestriction
+- OverloadedStrings
+- PartialTypeSignatures
+- PatternSynonyms
+- PolyKinds
+- QuantifiedConstraints
+- RankNTypes
+- RecordWildCards
+- RoleAnnotations
+- ScopedTypeVariables
+- StandaloneDeriving
+- Strict
+- TupleSections
+- TypeApplications
+- TypeFamilyDependencies
+- TypeOperators
+- TypeSynonymInstances
+- ViewPatterns

utils/src/Vulkan/Utils/Requirements/TH.hs

@@ -29,7 +29,7 @@ import           Text.Read                      ( readMaybe )
 import           Vulkan.Requirement
 import           Vulkan.Utils.Internal
 import           Vulkan.Utils.Misc
-import           Vulkan.Version                 ( pattern MAKE_VERSION )
+import           Vulkan.Version                 ( pattern MAKE_API_VERSION )
 
 -- $setup
 -- >>> import           Vulkan.Core11.Promoted_From_VK_KHR_multiview
@@ -234,7 +234,7 @@ parse =
       separator
       mi <- word
       pa <- fromMaybe 0 <$> (separator *> optional word)
-      pure $ Version (MAKE_VERSION ma mi pa)
+      pure $ Version (MAKE_API_VERSION ma mi pa)
 
     feature = do
       s <- qual con

utils/vulkan-utils.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.24
 -- see: https://github.com/sol/hpack
 
 name:           vulkan-utils
-version:        0.5.0
+version:        0.5.0.1
 synopsis:       Utils for the vulkan package
 category:       Graphics
 homepage:       https://github.com/expipiplus1/vulkan#readme
@@ -40,13 +40,13 @@ library
       Vulkan.Utils.QueueAssignment
       Vulkan.Utils.Requirements
       Vulkan.Utils.Requirements.TH
-      Vulkan.Utils.ShaderQQ.Interpolate
       Vulkan.Utils.ShaderQQ.Backend.Glslang
       Vulkan.Utils.ShaderQQ.Backend.Shaderc
       Vulkan.Utils.ShaderQQ.GLSL.Glslang
       Vulkan.Utils.ShaderQQ.GLSL.Shaderc
       Vulkan.Utils.ShaderQQ.HLSL.Glslang
       Vulkan.Utils.ShaderQQ.HLSL.Shaderc
+      Vulkan.Utils.ShaderQQ.Interpolate
   other-modules:
       Vulkan.Utils.Internal
       Vulkan.Utils.ShaderQQ.ShaderType