diff --git a/feedback/src/Feedback/Loop/OptParse.hs b/feedback/src/Feedback/Loop/OptParse.hs index 48a65db..13a3e0d 100644 --- a/feedback/src/Feedback/Loop/OptParse.hs +++ b/feedback/src/Feedback/Loop/OptParse.hs @@ -70,7 +70,7 @@ prettyConfiguration mConf = case mConf of [""], layoutAsTable ( map - (uncurry loopConfigLine) + (pure . uncurry loopConfigLine) (M.toList (configLoops conf)) ), [fore blue "Run ", fore yellow "feedback loopname", fore blue " to activate a feedback loop."] diff --git a/flake.lock b/flake.lock index c8ffa08..b95dd40 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "autodocodec": { "flake": false, "locked": { - "lastModified": 1701673930, - "narHash": "sha256-Mv8LNgJrQpHpuxg7jMuYuUoLeWCW+0OvqST4KNJYH9k=", + "lastModified": 1719160008, + "narHash": "sha256-ZVcod9Yp3lzzZa/NEkqHp0jnxRrcMv3Z+sQ1dxmpnPo=", "owner": "NorfairKing", "repo": "autodocodec", - "rev": "958a1c51fbf2f166974a60e2d0a5d266483baff5", + "rev": "36779707f38ec3aeb0a591ff8043a63717c96ea2", "type": "github" }, "original": { @@ -19,11 +19,11 @@ "dekking": { "flake": false, "locked": { - "lastModified": 1702048665, - "narHash": "sha256-DHGLHBiZMNUaaVDVM979gKh2N5BqOssBIQTWGKfoPls=", + "lastModified": 1717353868, + "narHash": "sha256-skkBIDSRj0UQDgPVmiF8aj13ozkoeq94kTAhROlH8cE=", "owner": "NorfairKing", "repo": "dekking", - "rev": "e74091e032254c70740769996564d55ceac51278", + "rev": "0ac013f211e047db3d6b9ca0c67d1f6334faf561", "type": "github" }, "original": { @@ -35,11 +35,11 @@ "fast-myers-diff": { "flake": false, "locked": { - "lastModified": 1701674450, - "narHash": "sha256-1RP8wXPZGKB/OSdxcjvxAJCqC+trWzrNcD7UGAdpHiA=", + "lastModified": 1717390032, + "narHash": "sha256-7O9MA3G8CQtiAQaTsj5WskieLR0BhjfFAQsq7CWJFnQ=", "owner": "NorfairKing", "repo": "fast-myers-diff", - "rev": "7fe372e635f293cc76de95773bdc4f0eaae89597", + "rev": "ac52f5779739c46aa1c014108bbbd1e7464cdf75", "type": "github" }, "original": { @@ -64,24 +64,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -105,27 +87,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712867921, - "narHash": "sha256-edTFV4KldkCMdViC/rmpJa7oLIU8SE/S35lh/ukC7bg=", + "lastModified": 1719145550, + "narHash": "sha256-K0i/coxxTEl30tgt4oALaylQfxqbotTSNb1/+g+mKMQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "51651a540816273b67bc4dedea2d37d116c5f7fe", + "rev": "e4509b3a560c87a8d4cb6f9992b8915abf9e36d8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1718447546, + "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "842253bf992c3a7157b67600c2857193f126563a", "type": "github" }, "original": { @@ -137,11 +119,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710765496, - "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=", + "lastModified": 1718606988, + "narHash": "sha256-pmjP5ePc1jz+Okona3HxD7AYT0wbrCwm9bXAlj08nDM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e367f7a1fb93137af22a3908f00b9a35e2d286a7", + "rev": "38d3352a65ac9d621b0cd3074d3bef27199ff78f", "type": "github" }, "original": { @@ -154,17 +136,16 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils", "gitignore": "gitignore", "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1712897695, - "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "lastModified": 1718879355, + "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", "type": "github" }, "original": { @@ -189,11 +170,11 @@ "safe-coloured-text": { "flake": false, "locked": { - "lastModified": 1711626793, - "narHash": "sha256-Pu7cKBjljx7wY4OoQ6T6Uu92+Hsj2SnuutYsVN3U89A=", + "lastModified": 1719159317, + "narHash": "sha256-5P+iUgLtQa7p9XzX7gt9pfJBLzAfGJ0dlb1Lw0eZIv0=", "owner": "NorfairKing", "repo": "safe-coloured-text", - "rev": "4161e707b1b0a8090a7149b8195f15943fa29fa9", + "rev": "61f14d21b7399fe97da24e484c2f9fedaf532bb8", "type": "github" }, "original": { @@ -205,11 +186,11 @@ "sydtest": { "flake": false, "locked": { - "lastModified": 1701869719, - "narHash": "sha256-+qrn2utn8W754ifrm5phT3DtAtK78vjlNObFWRHRxHg=", + "lastModified": 1717391148, + "narHash": "sha256-LDjuZAqincm814E0wCsiZEHKiwLx20srJyAkUsCYpTA=", "owner": "NorfairKing", "repo": "sydtest", - "rev": "d22ec20ca32854f880295cb373f84e874be916bb", + "rev": "6be618a53366d2453ba55da6cddc119d6d589916", "type": "github" }, "original": { @@ -218,29 +199,14 @@ "type": "github" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "validity": { "flake": false, "locked": { - "lastModified": 1701673254, - "narHash": "sha256-TsSkc2kqAoJ/S6HaK4t4S9r7nDvcHEPiNzMjlPnkb4Y=", + "lastModified": 1717390480, + "narHash": "sha256-+l3WF6uhVoZhoOipKrTEAuI5fPlmz/X5lPa7maTdYY4=", "owner": "NorfairKing", "repo": "validity", - "rev": "57c4897ccfeb3de60489e0328113798f059ef140", + "rev": "b7bf25ca71a0b3f56f58326357c5148246a7a23e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3a11332..0be3782 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-24.05"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; weeder-nix.url = "github:NorfairKing/weeder-nix"; weeder-nix.flake = false; @@ -89,24 +89,22 @@ }; devShells.${system}.default = pkgs.haskellPackages.shellFor { name = "feedback-shell"; - packages = p: [ p.feedback p.feedback-test-harness ]; + packages = p: [ + p.feedback + # p.feedback-test-harness + ]; withHoogle = true; doBenchmark = true; - buildInputs = (with pkgs; [ - feedback + buildInputs = with pkgs; [ niv zlib cabal-install - ]) ++ (with pre-commit-hooks.packages.${system}; - [ - hlint - hpack - nixpkgs-fmt - ormolu - cabal2nix - tagref - ]); - shellHook = self.checks.${system}.pre-commit.shellHook + pkgs.feedback.shellHook; + ] ++ self.checks.${system}.pre-commit.enabledPackages; + shellHook = self.checks.${system}.pre-commit.shellHook; + }; + nix-ci.cachix = { + name = "feedback"; + public-key = "feedback.cachix.org-1:8PNDEJ4GTCbsFUwxVWE/ulyoBMDqqL23JA44yB0j1jI="; }; }; }