From b14c0f528538b5067635330987784603f619c2d7 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sun, 20 Apr 2025 13:45:45 +1000 Subject: [PATCH 1/7] haskell: Use simplified lvar --- flake.lock | 18 ++++++++++++++++++ flake.nix | 3 +++ nix/modules/flake-parts/haskell.nix | 1 + 3 files changed, 22 insertions(+) diff --git a/flake.lock b/flake.lock index e7c8d2da3..665f512ff 100644 --- a/flake.lock +++ b/flake.lock @@ -130,6 +130,23 @@ "type": "github" } }, + "lvar": { + "flake": false, + "locked": { + "lastModified": 1745106020, + "narHash": "sha256-z0XLcs4uOolSOe3Flsxz81onlVqp5Ax25Y4+Gw0jcJE=", + "owner": "srid", + "repo": "lvar", + "rev": "317b1ff723ac4ebe8e5565d8001716e396011606", + "type": "github" + }, + "original": { + "owner": "srid", + "ref": "simplify", + "repo": "lvar", + "type": "github" + } + }, "nixos-unified": { "locked": { "lastModified": 1729697921, @@ -171,6 +188,7 @@ "flake-root": "flake-root", "haskell-flake": "haskell-flake", "heist-extra": "heist-extra", + "lvar": "lvar", "nixos-unified": "nixos-unified", "nixpkgs": "nixpkgs", "treefmt-nix": "treefmt-nix", diff --git a/flake.nix b/flake.nix index ee2eba70b..3a89b5b12 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,9 @@ ema.url = "github:srid/ema"; ema.flake = false; + lvar.url = "github:srid/lvar/simplify"; + lvar.flake = false; + heist-extra.url = "github:srid/heist-extra"; heist-extra.flake = false; diff --git a/nix/modules/flake-parts/haskell.nix b/nix/modules/flake-parts/haskell.nix index 1618e83fe..2100726bf 100644 --- a/nix/modules/flake-parts/haskell.nix +++ b/nix/modules/flake-parts/haskell.nix @@ -21,6 +21,7 @@ fsnotify.source = "0.4.1.0"; # Not in nixpkgs, yet. ghcid.source = "0.8.8"; heist-extra.source = inputs.heist-extra; + lvar.source = inputs.lvar; ema.source = inputs.ema + /ema; ema-generics.source = inputs.ema + /ema-generics; From 67b9db22d02596f83caf31c7dfc72cfe72903856 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sun, 20 Apr 2025 14:01:33 +1000 Subject: [PATCH 2/7] haskell: Use ema --- flake.lock | 7 ++++--- flake.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 665f512ff..aeab11ed0 100644 --- a/flake.lock +++ b/flake.lock @@ -35,15 +35,16 @@ "ema": { "flake": false, "locked": { - "lastModified": 1738428103, - "narHash": "sha256-vZgaNI0y6IKnWDSLFsl7mwSUZ3ONgduclQkB6WK0VMo=", + "lastModified": 1745121240, + "narHash": "sha256-iHkVp1yUQ2ukdiEbrLAyw/LFCSCGH7lACUDSxBLXl5k=", "owner": "srid", "repo": "ema", - "rev": "4478e88d33126ef0b478b2980a71592b8f9afd6b", + "rev": "007df5fa5f4e04011809716f6823b4d23d2bf18a", "type": "github" }, "original": { "owner": "srid", + "ref": "lvar-simplified", "repo": "ema", "type": "github" } diff --git a/flake.nix b/flake.nix index 3a89b5b12..75daae2b9 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ flake-root.url = "github:srid/flake-root"; nixos-unified.url = "github:srid/nixos-unified"; - ema.url = "github:srid/ema"; + ema.url = "github:srid/ema/lvar-simplified"; ema.flake = false; lvar.url = "github:srid/lvar/simplify"; From 301200a49f97726e3d82de4b931de92569fcb1a6 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sun, 20 Apr 2025 14:09:00 +1000 Subject: [PATCH 3/7] lvar is unused --- emanote/emanote.cabal | 1 - flake.lock | 18 ------------------ flake.nix | 3 --- nix/modules/flake-parts/haskell.nix | 1 - 4 files changed, 23 deletions(-) diff --git a/emanote/emanote.cabal b/emanote/emanote.cabal index d830f2e4e..8c4cb4006 100644 --- a/emanote/emanote.cabal +++ b/emanote/emanote.cabal @@ -117,7 +117,6 @@ common library-common , hspec , hspec-hedgehog , ixset-typed >=0.5.1.0 - , lvar , map-syntax , megaparsec , monad-logger diff --git a/flake.lock b/flake.lock index aeab11ed0..db3a8c6ed 100644 --- a/flake.lock +++ b/flake.lock @@ -131,23 +131,6 @@ "type": "github" } }, - "lvar": { - "flake": false, - "locked": { - "lastModified": 1745106020, - "narHash": "sha256-z0XLcs4uOolSOe3Flsxz81onlVqp5Ax25Y4+Gw0jcJE=", - "owner": "srid", - "repo": "lvar", - "rev": "317b1ff723ac4ebe8e5565d8001716e396011606", - "type": "github" - }, - "original": { - "owner": "srid", - "ref": "simplify", - "repo": "lvar", - "type": "github" - } - }, "nixos-unified": { "locked": { "lastModified": 1729697921, @@ -189,7 +172,6 @@ "flake-root": "flake-root", "haskell-flake": "haskell-flake", "heist-extra": "heist-extra", - "lvar": "lvar", "nixos-unified": "nixos-unified", "nixpkgs": "nixpkgs", "treefmt-nix": "treefmt-nix", diff --git a/flake.nix b/flake.nix index 75daae2b9..4a58e34a0 100644 --- a/flake.nix +++ b/flake.nix @@ -17,9 +17,6 @@ ema.url = "github:srid/ema/lvar-simplified"; ema.flake = false; - lvar.url = "github:srid/lvar/simplify"; - lvar.flake = false; - heist-extra.url = "github:srid/heist-extra"; heist-extra.flake = false; diff --git a/nix/modules/flake-parts/haskell.nix b/nix/modules/flake-parts/haskell.nix index 2100726bf..1618e83fe 100644 --- a/nix/modules/flake-parts/haskell.nix +++ b/nix/modules/flake-parts/haskell.nix @@ -21,7 +21,6 @@ fsnotify.source = "0.4.1.0"; # Not in nixpkgs, yet. ghcid.source = "0.8.8"; heist-extra.source = inputs.heist-extra; - lvar.source = inputs.lvar; ema.source = inputs.ema + /ema; ema-generics.source = inputs.ema + /ema-generics; From 41c667fc6e33dd3ac86899dce6c9a5010803e3be Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sun, 20 Apr 2025 14:24:32 +1000 Subject: [PATCH 4/7] update ema --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index db3a8c6ed..c705289bf 100644 --- a/flake.lock +++ b/flake.lock @@ -35,11 +35,11 @@ "ema": { "flake": false, "locked": { - "lastModified": 1745121240, - "narHash": "sha256-iHkVp1yUQ2ukdiEbrLAyw/LFCSCGH7lACUDSxBLXl5k=", + "lastModified": 1745123012, + "narHash": "sha256-FD6GJaiiKkH65N7iDjHtOtaEcWMf1P/t98kktILSkcg=", "owner": "srid", "repo": "ema", - "rev": "007df5fa5f4e04011809716f6823b4d23d2bf18a", + "rev": "05e75da1fc1951db7cf9915123694b119a120ffd", "type": "github" }, "original": { From 13f6a42e557efa9eb730e0eb9cce3d639e421866 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sun, 20 Apr 2025 14:27:56 +1000 Subject: [PATCH 5/7] use lvar master --- flake.lock | 17 +++++++++++++++++ flake.nix | 2 ++ nix/modules/flake-parts/haskell.nix | 1 + 3 files changed, 20 insertions(+) diff --git a/flake.lock b/flake.lock index c705289bf..3c54e0b7d 100644 --- a/flake.lock +++ b/flake.lock @@ -131,6 +131,22 @@ "type": "github" } }, + "lvar": { + "flake": false, + "locked": { + "lastModified": 1745122737, + "narHash": "sha256-ZnYXkkPmnNvt4tA45JgSC7dpttmqhUo4AHfEjB1r1gE=", + "owner": "srid", + "repo": "lvar", + "rev": "047a24c4dcd7f85f9c18058f6be991cea531870e", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "lvar", + "type": "github" + } + }, "nixos-unified": { "locked": { "lastModified": 1729697921, @@ -172,6 +188,7 @@ "flake-root": "flake-root", "haskell-flake": "haskell-flake", "heist-extra": "heist-extra", + "lvar": "lvar", "nixos-unified": "nixos-unified", "nixpkgs": "nixpkgs", "treefmt-nix": "treefmt-nix", diff --git a/flake.nix b/flake.nix index 4a58e34a0..355d3775e 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,8 @@ ema.url = "github:srid/ema/lvar-simplified"; ema.flake = false; + lvar.url = "github:srid/lvar"; + lvar.flake = false; heist-extra.url = "github:srid/heist-extra"; heist-extra.flake = false; diff --git a/nix/modules/flake-parts/haskell.nix b/nix/modules/flake-parts/haskell.nix index 1618e83fe..7f72ab09a 100644 --- a/nix/modules/flake-parts/haskell.nix +++ b/nix/modules/flake-parts/haskell.nix @@ -25,6 +25,7 @@ ema.source = inputs.ema + /ema; ema-generics.source = inputs.ema + /ema-generics; ema-extra.source = inputs.ema + /ema-extra; + lvar.source = inputs.lvar; }; settings = { From 5d1373e9b57d3cff5cbf6fc3bdf23ab76f1e5f06 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sun, 20 Apr 2025 14:32:34 +1000 Subject: [PATCH 6/7] mas --- flake.lock | 5 ++--- flake.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 3c54e0b7d..9fb759f16 100644 --- a/flake.lock +++ b/flake.lock @@ -35,16 +35,15 @@ "ema": { "flake": false, "locked": { - "lastModified": 1745123012, + "lastModified": 1745123527, "narHash": "sha256-FD6GJaiiKkH65N7iDjHtOtaEcWMf1P/t98kktILSkcg=", "owner": "srid", "repo": "ema", - "rev": "05e75da1fc1951db7cf9915123694b119a120ffd", + "rev": "8590cc91e1f3dc3e10409d914c40a484645a2680", "type": "github" }, "original": { "owner": "srid", - "ref": "lvar-simplified", "repo": "ema", "type": "github" } diff --git a/flake.nix b/flake.nix index 355d3775e..8b46b54c1 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ flake-root.url = "github:srid/flake-root"; nixos-unified.url = "github:srid/nixos-unified"; - ema.url = "github:srid/ema/lvar-simplified"; + ema.url = "github:srid/ema"; ema.flake = false; lvar.url = "github:srid/lvar"; lvar.flake = false; From 8260d79aed7de7c50233d5230d07d8fc48900e15 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sun, 20 Apr 2025 14:33:09 +1000 Subject: [PATCH 7/7] up ver --- emanote/emanote.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emanote/emanote.cabal b/emanote/emanote.cabal index 8c4cb4006..65f9e253a 100644 --- a/emanote/emanote.cabal +++ b/emanote/emanote.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: emanote -version: 1.3.27.1 +version: 1.3.28.0 license: AGPL-3.0-only copyright: 2022 Sridhar Ratnakumar maintainer: srid@srid.ca