Merge pull request #10 from taffybar/version-0.1.4.0

Bump version to 0.1.4.0 & CI updates

Author: colonelpanic8

.github/workflows/build.yml

@@ -9,15 +9,12 @@ jobs:
     runs-on: ubuntu-latest
     name: Nix Flake - Linux
     steps:
+      - name: Clone project
+        uses: actions/checkout@v5
       - name: Install Nix
-        uses: cachix/install-nix-action@v13
+        uses: cachix/install-nix-action@v31
         with:
-          install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
-          install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
-          extra_nix_config: |
-            experimental-features = nix-command flakes
-            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-      - name: Clone project
-        uses: actions/checkout@v2
+          github_access_token: ${{ secrets.GITHUB_TOKEN }}
       - name: Build
         run: nix build
+      - run: nix flake check

.gitignore

@@ -1,3 +1,4 @@
 .stack-work/
-gtk-strut.cabal
+/dist-newstyle/
+/result*
 *~

.travis.yml

@@ -1,3 +1,6 @@
 # Changelog for gtk-strut
 
-## Unreleased changes
+## 0.1.4.0
+
+- Use the `gi-gtk3` and `gi-gdk3` build dependencies, which have been
+  renamed from `gi-gtk` and `gi-gdk`.

ChangeLog.md

@@ -1,12 +1,28 @@
 {
   description = "gtk-strut";
   inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
-    git-ignore-nix.url = github:hercules-ci/gitignore.nix/master;
+    git-ignore-nix.url = "github:hercules-ci/gitignore.nix";
+    git-ignore-nix.inputs.nixpkgs.follows = "nixpkgs";
   };
   outputs = { self, flake-utils, nixpkgs, git-ignore-nix }:
-  let
-    overlay = final: prev: {
+  flake-utils.lib.eachDefaultSystem (system: let
+    pkgs = import nixpkgs {
+      inherit system;
+      overlays = [ self.overlays.default ];
+      config.allowBroken = true;
+    };
+  in {
+    devShells.default = pkgs.haskellPackages.shellFor {
+      packages = p: [ p.gtk-strut ];
+      nativeBuildInputs = with pkgs.haskellPackages; [
+        cabal-install hlint ghcid ormolu implicit-hie haskell-language-server
+      ];
+    };
+    packages.default = pkgs.haskellPackages.gtk-strut;
+  }) // {
+    overlays.default = final: prev: {
       haskellPackages = prev.haskellPackages.override (old: {
         overrides = prev.lib.composeExtensions (old.overrides or (_: _: {}))
         (hself: hsuper: {
@@ -17,17 +33,5 @@
         });
       });
     };
-    overlays = [ overlay ];
-  in flake-utils.lib.eachDefaultSystem (system:
-  let pkgs = import nixpkgs { inherit system overlays; config.allowBroken = true; };
-  in
-  rec {
-    devShell = pkgs.haskellPackages.shellFor {
-      packages = p: [ p.gtk-strut ];
-      nativeBuildInputs = with pkgs.haskellPackages; [
-        cabal-install hlint ghcid ormolu implicit-hie haskell-language-server
-      ];
-    };
-    defaultPackage = pkgs.haskellPackages.gtk-strut;
-  }) // { inherit overlay overlays; } ;
+  };
 }

flake.lock

@@ -0,0 +1,43 @@
+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.38.2.
+--
+-- see: https://github.com/sol/hpack
+
+name:           gtk-strut
+version:        0.1.4.0
+synopsis:       Library for creating strut windows with gi-gtk
+description:    Please see the README on Github at <https://github.com/IvanMalison/gtk-strut#readme>
+category:       System
+homepage:       https://github.com/IvanMalison/gtk-strut#readme
+bug-reports:    https://github.com/IvanMalison/gtk-strut/issues
+author:         Ivan Malison
+maintainer:     [email protected]
+copyright:      Ivan Malison
+license:        BSD3
+license-file:   LICENSE
+build-type:     Simple
+extra-source-files:
+    README.md
+    ChangeLog.md
+
+source-repository head
+  type: git
+  location: https://github.com/IvanMalison/gtk-strut
+
+library
+  exposed-modules:
+      Graphics.UI.GIGtkStrut
+  other-modules:
+      Graphics.UI.EWMHStrut
+  hs-source-dirs:
+      src
+  build-depends:
+      base >=4.7 && <5
+    , data-default
+    , gi-gdk3
+    , gi-gtk3
+    , hslogger
+    , text
+    , transformers
+  default-language: Haskell2010

flake.nix

@@ -1,5 +1,5 @@
 name:                gtk-strut
-version:             0.1.3.2
+version:             0.1.4.0
 github:              "IvanMalison/gtk-strut"
 license:             BSD3
 author:              "Ivan Malison"