diff --git a/GPipe-GLFW/GPipe-GLFW.cabal b/GPipe-GLFW/GPipe-GLFW.cabal index 5c774d3..146031e 100644 --- a/GPipe-GLFW/GPipe-GLFW.cabal +++ b/GPipe-GLFW/GPipe-GLFW.cabal @@ -22,10 +22,10 @@ library hs-source-dirs: src build-depends: base >= 4.7 && <5 , stm >= 2.4 && <3 - , containers >= 0.5 && <0.7 + , containers >= 0.5 && <0.8 , async >= 2.1 && <2.3 , GLFW-b >= 3.2 && <3.4 - , GPipe >= 2.2 && <2.5 + , GPipe >= 2.2 && <2.6 ghc-options: -Wall -Wno-orphans -Wall default-language: Haskell2010 exposed-modules: Graphics.GPipe.Context.GLFW diff --git a/cabal.project b/cabal.project index 57b9ad3..11c8ee5 100644 --- a/cabal.project +++ b/cabal.project @@ -1,2 +1,2 @@ packages: ./GPipe-GLFW -packages: ./Smoketests +packages: ../GPipe-Core/GPipe-Core diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..13c3d1c --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1772736753, + "narHash": "sha256-au/m3+EuBLoSzWUCb64a/MZq6QUtOV8oC0D9tY2scPQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "917fec990948658ef1ccd07cef2a1ef060786846", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..8318665 --- /dev/null +++ b/flake.nix @@ -0,0 +1,39 @@ +{ + description = "GPipe-GLFW - GLFW context for GPipe (fork)"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + hp = pkgs.haskellPackages; + ghcWithPackages = hp.ghcWithPackages (p: [ + p.transformers + p.exception-transformers + p.containers + p.Boolean + p.hashtables + p.gl + p.linear + p.stm + p.async + p.GLFW-b + ]); + in { + devShells.default = pkgs.mkShell { + buildInputs = [ + ghcWithPackages + hp.cabal-install + pkgs.pkg-config + pkgs.libGL + pkgs.libGLU + pkgs.glfw + ]; + }; + } + ); +}