diff --git a/develop/flake.lock b/develop/flake.lock
index 81b7d774c1d7c5e0abeb3f4b19752dcbf7a45ea3..1d99e7c318936468c8a86f22d289daa58338c20b 100644
--- a/develop/flake.lock
+++ b/develop/flake.lock
@@ -18,11 +18,11 @@
},
"crazyshell": {
"inputs": {
- "flake-utils": "flake-utils_4",
+ "flake-utils": "flake-utils_3",
"get-flake": "get-flake",
"horizon-core": "horizon-core_2",
"lint-utils": "lint-utils_3",
- "nixpkgs": "nixpkgs_8"
+ "nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1697046007,
@@ -79,14 +79,15 @@
"pre-commit-hooks": "pre-commit-hooks",
"safe-coloured-text": "safe-coloured-text",
"sydtest": "sydtest",
- "validity": "validity"
+ "validity": "validity",
+ "weeder-nix": "weeder-nix"
},
"locked": {
- "lastModified": 1705617203,
- "narHash": "sha256-KbhdkpYQ3H6/SJ25BZCOOpE3VGGMN8MDfj3SKERZjX8=",
+ "lastModified": 1713169350,
+ "narHash": "sha256-ExwxuftE018oszRTUmjP/Nu6zSFoCpyKqfsGMABHT/U=",
"owner": "NorfairKing",
"repo": "feedback",
- "rev": "19c15ebcac752b7c53959799afaeb841ab3b77ed",
+ "rev": "c727298d7b34252a5e9b360805c7d51252589a0a",
"type": "github"
},
"original": {
@@ -111,32 +112,16 @@
"type": "github"
}
},
- "flake-compat_2": {
- "flake": false,
- "locked": {
- "lastModified": 1650374568,
- "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
- "lastModified": 1706830856,
- "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
+ "lastModified": 1715865404,
+ "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
+ "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
"type": "github"
},
"original": {
@@ -150,11 +135,11 @@
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
- "lastModified": 1704982712,
- "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=",
+ "lastModified": 1706830856,
+ "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "07f6395285469419cf9d078f59b5b49993198c00",
+ "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
"type": "github"
},
"original": {
@@ -240,11 +225,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1701680307,
- "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+ "lastModified": 1710146030,
+ "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+ "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@@ -268,21 +253,6 @@
"type": "github"
}
},
- "flake-utils_11": {
- "locked": {
- "lastModified": 1644229661,
- "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
"flake-utils_2": {
"locked": {
"lastModified": 1644229661,
@@ -299,21 +269,6 @@
}
},
"flake-utils_3": {
- "locked": {
- "lastModified": 1667395993,
- "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "flake-utils_4": {
"inputs": {
"systems": "systems_2"
},
@@ -331,7 +286,7 @@
"type": "github"
}
},
- "flake-utils_5": {
+ "flake-utils_4": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@@ -346,7 +301,7 @@
"type": "github"
}
},
- "flake-utils_6": {
+ "flake-utils_5": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@@ -361,7 +316,7 @@
"type": "github"
}
},
- "flake-utils_7": {
+ "flake-utils_6": {
"inputs": {
"systems": "systems_3"
},
@@ -379,6 +334,21 @@
"type": "github"
}
},
+ "flake-utils_7": {
+ "locked": {
+ "lastModified": 1644229661,
+ "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
"flake-utils_8": {
"locked": {
"lastModified": 1644229661,
@@ -449,11 +419,11 @@
]
},
"locked": {
- "lastModified": 1703887061,
- "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
+ "lastModified": 1709087332,
+ "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
- "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
+ "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
@@ -472,27 +442,14 @@
"flake-parts"
],
"horizon-ghc": "horizon-ghc",
- "lint-utils": [
- "horizon-develop-flake",
- "horizon-core",
- "horizon-build-packages",
- "horizon-ghc",
- "lint-utils"
- ],
- "nixpkgs": [
- "horizon-develop-flake",
- "horizon-core",
- "horizon-build-packages",
- "horizon-ghc",
- "nixpkgs"
- ]
+ "nixpkgs": "nixpkgs_4"
},
"locked": {
- "lastModified": 1705690128,
- "narHash": "sha256-/kfN7WBO9hrsObiFceAybcbPSWaDIodUsO1GTERTlkY=",
+ "lastModified": 1716628657,
+ "narHash": "sha256-/9qChNYo4Z8oJnst7TpNiGXxN6r07PRFQKIRKWWv1g8=",
"ref": "refs/heads/master",
- "rev": "b9646aa4428f5ece1c45a58804ee3e07eaa76064",
- "revCount": 34,
+ "rev": "a72e840452086a81cdf1cc16fb66809bf3ec52d1",
+ "revCount": 87,
"type": "git",
"url": "https://gitlab.horizon-haskell.net/package-sets/horizon-build-packages"
},
@@ -506,7 +463,7 @@
"flake-parts": "flake-parts_5",
"horizon-ghc": "horizon-ghc_2",
"lint-utils": "lint-utils_5",
- "nixpkgs": "nixpkgs_12"
+ "nixpkgs": "nixpkgs_11"
},
"locked": {
"lastModified": 1701564295,
@@ -532,12 +489,6 @@
],
"horizon-build-packages": "horizon-build-packages",
"horizon-hoogle": "horizon-hoogle",
- "lint-utils": [
- "horizon-develop-flake",
- "horizon-core",
- "horizon-build-packages",
- "lint-utils"
- ],
"nixpkgs": [
"horizon-develop-flake",
"horizon-core",
@@ -546,11 +497,11 @@
]
},
"locked": {
- "lastModified": 1705691485,
- "narHash": "sha256-JPf+SmI8PSeDm7NLd0IzYpOhvXuQ7TcxkTa4Ufms9A0=",
+ "lastModified": 1716737426,
+ "narHash": "sha256-LibM8kBmh2m9aMRwYI2jEji7TY774oCQUhvurf5yYdI=",
"ref": "refs/heads/master",
- "rev": "b9b43248497e4d641a3747c7788c785b6b7460f6",
- "revCount": 1281,
+ "rev": "6f59d14a48a0ebf10fddce1f2c2437315a6f0d6f",
+ "revCount": 1359,
"type": "git",
"url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core"
},
@@ -564,7 +515,7 @@
"flake-parts": "flake-parts_3",
"get-flake": "get-flake_2",
"lint-utils": "lint-utils_2",
- "nixpkgs": "nixpkgs_7"
+ "nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1697043887,
@@ -586,7 +537,7 @@
"horizon-build-packages": "horizon-build-packages_2",
"horizon-hoogle": "horizon-hoogle_2",
"lint-utils": "lint-utils_6",
- "nixpkgs": "nixpkgs_14"
+ "nixpkgs": "nixpkgs_13"
},
"locked": {
"lastModified": 1701564656,
@@ -609,11 +560,11 @@
"horizon-shell": "horizon-shell"
},
"locked": {
- "lastModified": 1707581045,
- "narHash": "sha256-lo1mKVW/b5zIuDI1pXTKBGlfdnAeK7JoYPO2GDkbipY=",
+ "lastModified": 1716737610,
+ "narHash": "sha256-6QmMpw4feuZLc6klXMmn8m63wH1i1R1vtMrA5Ec9Iro=",
"ref": "refs/heads/master",
- "rev": "42dfc0c2d8fdecc830a2065d03667bc55ce477fd",
- "revCount": 34,
+ "rev": "5aea556e6f8da7ef8e7fffb023d3a81819b8a738",
+ "revCount": 37,
"type": "git",
"url": "https://gitlab.horizon-haskell.net/nix/horizon-develop-flake"
},
@@ -624,16 +575,30 @@
},
"horizon-ghc": {
"inputs": {
- "flake-parts": "flake-parts_2",
- "lint-utils": "lint-utils",
- "nixpkgs": "nixpkgs_5"
+ "flake-parts": [
+ "horizon-develop-flake",
+ "horizon-core",
+ "horizon-build-packages",
+ "horizon-ghc",
+ "nixica",
+ "flake-parts"
+ ],
+ "nixica": "nixica",
+ "nixpkgs": [
+ "horizon-develop-flake",
+ "horizon-core",
+ "horizon-build-packages",
+ "horizon-ghc",
+ "nixica",
+ "nixpkgs"
+ ]
},
"locked": {
- "lastModified": 1705522069,
- "narHash": "sha256-rzc9hZcaajtg3z+kwfW9w/7FKaqvVSJzf1iqMNIhQQo=",
+ "lastModified": 1716628408,
+ "narHash": "sha256-owaGnYzy8NQxaB9KpdsMdDJ5i2WWb9OBrCmAlrdY9OA=",
"ref": "refs/heads/master",
- "rev": "e37578d961a514ed1391df33a70de298c34daa50",
- "revCount": 32,
+ "rev": "1ff3a6b692dbb3fe21533e84502d5c1f4790c4a9",
+ "revCount": 101,
"type": "git",
"url": "https://gitlab.horizon-haskell.net/ghc/horizon-ghc"
},
@@ -646,7 +611,7 @@
"inputs": {
"flake-parts": "flake-parts_6",
"lint-utils": "lint-utils_4",
- "nixpkgs": "nixpkgs_10"
+ "nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1701518837,
@@ -695,10 +660,10 @@
"horizon-shell": {
"inputs": {
"crazyshell": "crazyshell",
- "flake-utils": "flake-utils_7",
+ "flake-utils": "flake-utils_6",
"horizon-core": "horizon-core_3",
"lint-utils": "lint-utils_7",
- "nixpkgs": "nixpkgs_15"
+ "nixpkgs": "nixpkgs_14"
},
"locked": {
"lastModified": 1705946338,
@@ -718,27 +683,33 @@
"lint-utils": {
"inputs": {
"flake-utils": "flake-utils_2",
- "nixfmt-rfc166": "nixfmt-rfc166",
- "nixpkgs": "nixpkgs_4"
+ "nixpkgs": [
+ "horizon-develop-flake",
+ "horizon-core",
+ "horizon-build-packages",
+ "horizon-ghc",
+ "nixica",
+ "nixpkgs"
+ ]
},
"locked": {
- "lastModified": 1704840768,
- "narHash": "sha256-vcm9RkJDR4aTVTKocdmKPSjAgAJw3Tu7UEDJxjAVxNk=",
- "ref": "refs/heads/master",
- "rev": "2d7660ce8ee2aa8eac650f670692706a1945f5a7",
- "revCount": 64,
- "type": "git",
- "url": "https://gitlab.nixica.dev/nix/lint-utils"
+ "lastModified": 1708583908,
+ "narHash": "sha256-zuNxxkt/wS8Z5TbGarf4QZVDt1R65dDkEw/s2T/tCW4=",
+ "owner": "homotopic",
+ "repo": "lint-utils",
+ "rev": "2d77caa3644065ee0f462cc5ea654280c59127b2",
+ "type": "github"
},
"original": {
- "type": "git",
- "url": "https://gitlab.nixica.dev/nix/lint-utils"
+ "owner": "homotopic",
+ "repo": "lint-utils",
+ "type": "github"
}
},
"lint-utils_2": {
"inputs": {
- "flake-utils": "flake-utils_5",
- "nixpkgs": "nixpkgs_6"
+ "flake-utils": "flake-utils_4",
+ "nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1681737193,
@@ -756,7 +727,7 @@
},
"lint-utils_3": {
"inputs": {
- "flake-utils": "flake-utils_6",
+ "flake-utils": "flake-utils_5",
"nixpkgs": [
"horizon-develop-flake",
"horizon-shell",
@@ -780,8 +751,8 @@
},
"lint-utils_4": {
"inputs": {
- "flake-utils": "flake-utils_8",
- "nixpkgs": "nixpkgs_9"
+ "flake-utils": "flake-utils_7",
+ "nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1699441004,
@@ -799,8 +770,8 @@
},
"lint-utils_5": {
"inputs": {
- "flake-utils": "flake-utils_9",
- "nixpkgs": "nixpkgs_11"
+ "flake-utils": "flake-utils_8",
+ "nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1699441004,
@@ -818,8 +789,8 @@
},
"lint-utils_6": {
"inputs": {
- "flake-utils": "flake-utils_10",
- "nixpkgs": "nixpkgs_13"
+ "flake-utils": "flake-utils_9",
+ "nixpkgs": "nixpkgs_12"
},
"locked": {
"lastModified": 1699441004,
@@ -837,7 +808,7 @@
},
"lint-utils_7": {
"inputs": {
- "flake-utils": "flake-utils_11",
+ "flake-utils": "flake-utils_10",
"nixpkgs": [
"horizon-develop-flake",
"horizon-shell",
@@ -858,35 +829,33 @@
"url": "https://gitlab.nixica.dev/nix/lint-utils"
}
},
- "nixfmt-rfc166": {
+ "nixica": {
"inputs": {
- "flake-compat": "flake-compat_2",
- "flake-utils": "flake-utils_3",
- "nixpkgs": "nixpkgs_3",
- "nixpkgs-stable": "nixpkgs-stable_2"
+ "flake-parts": "flake-parts_2",
+ "lint-utils": "lint-utils",
+ "nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1704833612,
- "narHash": "sha256-yhnKT8z5FOTUb/1ZXaErmFHsv1oKg1aYQVLVUCzQWMA=",
- "owner": "piegamesde",
- "repo": "nixfmt",
- "rev": "82457ef5fc7b324d3cab4300af0ff7f854135cfa",
- "type": "github"
+ "lastModified": 1709796500,
+ "narHash": "sha256-No1tx+wo5DjOCPAF6ayhQlRMB3jD6kKdp/9bh/dSN9c=",
+ "ref": "refs/heads/master",
+ "rev": "688f425ae7fdc0bb76b907863d27c5efaa19ce8a",
+ "revCount": 17,
+ "type": "git",
+ "url": "https://gitlab.horizon-haskell.net/nix/nixica-library"
},
"original": {
- "owner": "piegamesde",
- "ref": "rfc101-style",
- "repo": "nixfmt",
- "type": "github"
+ "type": "git",
+ "url": "https://gitlab.horizon-haskell.net/nix/nixica-library"
}
},
"nixpkgs": {
"locked": {
- "lastModified": 1705458851,
- "narHash": "sha256-uQvEhiv33Zj/Pv364dTvnpPwFSptRZgVedDzoM+HqVg=",
+ "lastModified": 1712867921,
+ "narHash": "sha256-edTFV4KldkCMdViC/rmpJa7oLIU8SE/S35lh/ukC7bg=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "8bf65f17d8070a0a490daf5f1c784b87ee73982c",
+ "rev": "51651a540816273b67bc4dedea2d37d116c5f7fe",
"type": "github"
},
"original": {
@@ -898,30 +867,24 @@
},
"nixpkgs-lib": {
"locked": {
- "dir": "lib",
- "lastModified": 1706550542,
- "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
- "type": "github"
+ "lastModified": 1714640452,
+ "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=",
+ "type": "tarball",
+ "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
},
"original": {
- "dir": "lib",
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
+ "type": "tarball",
+ "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
}
},
"nixpkgs-lib_2": {
"locked": {
"dir": "lib",
- "lastModified": 1703961334,
- "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=",
+ "lastModified": 1706550542,
+ "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9",
+ "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
"type": "github"
},
"original": {
@@ -1006,11 +969,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1704874635,
- "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
+ "lastModified": 1710695816,
+ "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
+ "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
"type": "github"
},
"original": {
@@ -1020,39 +983,7 @@
"type": "github"
}
},
- "nixpkgs-stable_2": {
- "locked": {
- "lastModified": 1672580127,
- "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "0874168639713f547c05947c76124f78441ea46c",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-22.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs_10": {
- "locked": {
- "lastModified": 1701253981,
- "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_11": {
"locked": {
"lastModified": 1644525281,
"narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=",
@@ -1068,7 +999,7 @@
"type": "github"
}
},
- "nixpkgs_12": {
+ "nixpkgs_11": {
"locked": {
"lastModified": 1701253981,
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
@@ -1084,7 +1015,7 @@
"type": "github"
}
},
- "nixpkgs_13": {
+ "nixpkgs_12": {
"locked": {
"lastModified": 1644525281,
"narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=",
@@ -1100,7 +1031,7 @@
"type": "github"
}
},
- "nixpkgs_14": {
+ "nixpkgs_13": {
"locked": {
"lastModified": 1701253981,
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
@@ -1116,7 +1047,7 @@
"type": "github"
}
},
- "nixpkgs_15": {
+ "nixpkgs_14": {
"locked": {
"lastModified": 1702272962,
"narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
@@ -1132,13 +1063,13 @@
"type": "github"
}
},
- "nixpkgs_16": {
+ "nixpkgs_15": {
"locked": {
- "lastModified": 1707956935,
- "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=",
+ "lastModified": 1716769173,
+ "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c",
+ "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632",
"type": "github"
},
"original": {
@@ -1150,11 +1081,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1704842529,
- "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=",
+ "lastModified": 1710765496,
+ "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5",
+ "rev": "e367f7a1fb93137af22a3908f00b9a35e2d286a7",
"type": "github"
},
"original": {
@@ -1166,53 +1097,37 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1667292599,
- "narHash": "sha256-7ISOUI1aj6UKMPIL+wwthENL22L3+A9V+jS8Is3QsRo=",
+ "lastModified": 1708992772,
+ "narHash": "sha256-TWy2VNWAzNOPbZ1InbJtm7GYOyIG/BWKPCwmNDCnDLs=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "ef2f213d9659a274985778bff4ca322f3ef3ac68",
+ "rev": "7e5ed63169046d8250ded004cfbd5f8b13b264e7",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixpkgs-unstable",
+ "ref": "haskell-updates",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
- "lastModified": 1644525281,
- "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=",
+ "lastModified": 1716596003,
+ "narHash": "sha256-WW4LMtqDXBqXQ1TlMpCYZhpkwxQsr77RvLb8UfdaSXs=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2",
+ "rev": "edc6c261ab4ffb277af409e37a52718a91b255bc",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-unstable",
+ "ref": "haskell-updates",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
- "locked": {
- "lastModified": 1705316053,
- "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_6": {
"locked": {
"lastModified": 1644525281,
"narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=",
@@ -1228,7 +1143,7 @@
"type": "github"
}
},
- "nixpkgs_7": {
+ "nixpkgs_6": {
"locked": {
"lastModified": 1686701582,
"narHash": "sha256-uCj6bWmhb2RF+kmCP7T5ov5pg3HjksIyv4WDsCHZQyU=",
@@ -1244,7 +1159,7 @@
"type": "github"
}
},
- "nixpkgs_8": {
+ "nixpkgs_7": {
"locked": {
"lastModified": 1696757521,
"narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=",
@@ -1260,7 +1175,7 @@
"type": "github"
}
},
- "nixpkgs_9": {
+ "nixpkgs_8": {
"locked": {
"lastModified": 1644525281,
"narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=",
@@ -1276,6 +1191,22 @@
"type": "github"
}
},
+ "nixpkgs_9": {
+ "locked": {
+ "lastModified": 1701253981,
+ "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat",
@@ -1285,11 +1216,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1705229514,
- "narHash": "sha256-itILy0zimR/iyUGq5Dgg0fiW8plRDyxF153LWGsg3Cw=",
+ "lastModified": 1712897695,
+ "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "ffa9a5b90b0acfaa03b1533b83eaf5dead819a05",
+ "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8",
"type": "github"
},
"original": {
@@ -1302,17 +1233,17 @@
"inputs": {
"flake-parts": "flake-parts",
"horizon-develop-flake": "horizon-develop-flake",
- "nixpkgs": "nixpkgs_16"
+ "nixpkgs": "nixpkgs_15"
}
},
"safe-coloured-text": {
"flake": false,
"locked": {
- "lastModified": 1701941869,
- "narHash": "sha256-BOsn+Q92scoIy0XPqAIjZ5iio2WE5mx0DThCdL1ajUs=",
+ "lastModified": 1711626793,
+ "narHash": "sha256-Pu7cKBjljx7wY4OoQ6T6Uu92+Hsj2SnuutYsVN3U89A=",
"owner": "NorfairKing",
"repo": "safe-coloured-text",
- "rev": "b8f83cfb47ed6ada2da2d55979cf2b7dd3867b2f",
+ "rev": "4161e707b1b0a8090a7149b8195f15943fa29fa9",
"type": "github"
},
"original": {
@@ -1397,6 +1328,22 @@
"repo": "validity",
"type": "github"
}
+ },
+ "weeder-nix": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1712652513,
+ "narHash": "sha256-etbllbKKJNVHogT89VkgevuaSLa0SA24OGpSDKTrGX0=",
+ "owner": "NorfairKing",
+ "repo": "weeder-nix",
+ "rev": "d49eebf716fd512d5e521bfed49c3281ca12dc1c",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NorfairKing",
+ "repo": "weeder-nix",
+ "type": "github"
+ }
}
},
"root": "root",
diff --git a/flake.lock b/flake.lock
index 09913dfa652cac9abaeb329084b08dd9f01d2d4e..252a9353f4991fd599646278e14cf33743b296ca 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
- "lastModified": 1706830856,
- "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
+ "lastModified": 1715865404,
+ "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
+ "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
"type": "github"
},
"original": {
@@ -54,27 +54,39 @@
"type": "github"
}
},
+ "flake-utils": {
+ "locked": {
+ "lastModified": 1644229661,
+ "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
"horizon-advance": {
"inputs": {
"flake-parts": [
+ "horizon-platform",
"horizon-advance",
"horizon-core",
"flake-parts"
],
"horizon-core": "horizon-core",
"horizon-hoogle": "horizon-hoogle_2",
- "nixpkgs": [
- "horizon-advance",
- "horizon-core",
- "nixpkgs"
- ]
+ "nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1708097792,
- "narHash": "sha256-yUVdQ5l571gEj3/8KqPM+Y/Qxf79/HlD1mowQVnOIas=",
+ "lastModified": 1716825091,
+ "narHash": "sha256-kx5T+WmWX6b4MKoz2bdA3YxzVL7RB3NaL2RE2RM9Lgc=",
"ref": "refs/heads/master",
- "rev": "ec352a6e49db16d52017e975b1a714a79751386b",
- "revCount": 184,
+ "rev": "6c34844520dfbf559abd34b645aa3a474f6a0c03",
+ "revCount": 241,
"type": "git",
"url": "https://gitlab.horizon-haskell.net/package-sets/horizon-advance"
},
@@ -85,21 +97,27 @@
},
"horizon-build-packages": {
"inputs": {
- "flake-parts": "flake-parts_2",
+ "flake-parts": [
+ "horizon-platform",
+ "horizon-advance",
+ "horizon-core",
+ "horizon-build-packages",
+ "horizon-ghc",
+ "flake-parts"
+ ],
"horizon-ghc": "horizon-ghc",
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1707652105,
- "narHash": "sha256-L11gYDW1mUWCJjfvEqCZkPR7cSWl3jIwny9p70tBKcY=",
- "ref": "lts/ghc-9.8.x",
- "rev": "d3bae233afd01fbecbe599f42588e77ee120fcd0",
- "revCount": 50,
+ "lastModified": 1716628657,
+ "narHash": "sha256-/9qChNYo4Z8oJnst7TpNiGXxN6r07PRFQKIRKWWv1g8=",
+ "ref": "refs/heads/master",
+ "rev": "a72e840452086a81cdf1cc16fb66809bf3ec52d1",
+ "revCount": 87,
"type": "git",
"url": "https://gitlab.horizon-haskell.net/package-sets/horizon-build-packages"
},
"original": {
- "ref": "lts/ghc-9.8.x",
"type": "git",
"url": "https://gitlab.horizon-haskell.net/package-sets/horizon-build-packages"
}
@@ -107,6 +125,7 @@
"horizon-core": {
"inputs": {
"flake-parts": [
+ "horizon-platform",
"horizon-advance",
"horizon-core",
"horizon-build-packages",
@@ -115,6 +134,7 @@
"horizon-build-packages": "horizon-build-packages",
"horizon-hoogle": "horizon-hoogle",
"nixpkgs": [
+ "horizon-platform",
"horizon-advance",
"horizon-core",
"horizon-build-packages",
@@ -122,31 +142,47 @@
]
},
"locked": {
- "lastModified": 1708097604,
- "narHash": "sha256-7XBAjKLpQ9K0xnBHIaMVkO7ac2M0zgbrAmOP4czO+yc=",
- "ref": "lts/ghc-9.8.x",
- "rev": "2da105830932bfdda2b58b6f4c79b088d4f8cb70",
- "revCount": 1304,
+ "lastModified": 1716659360,
+ "narHash": "sha256-rplm3bnepyQ/Nh0g4yzJnxVE5+S8Sa/XhP1lrf2XWf0=",
+ "ref": "refs/heads/master",
+ "rev": "30fc12c018b65916405292366667c62371e0ec6a",
+ "revCount": 1347,
"type": "git",
"url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core"
},
"original": {
- "ref": "lts/ghc-9.8.x",
"type": "git",
"url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core"
}
},
"horizon-ghc": {
"inputs": {
- "flake-parts": "flake-parts_3",
- "nixpkgs": "nixpkgs"
+ "flake-parts": [
+ "horizon-platform",
+ "horizon-advance",
+ "horizon-core",
+ "horizon-build-packages",
+ "horizon-ghc",
+ "nixica",
+ "flake-parts"
+ ],
+ "nixica": "nixica",
+ "nixpkgs": [
+ "horizon-platform",
+ "horizon-advance",
+ "horizon-core",
+ "horizon-build-packages",
+ "horizon-ghc",
+ "nixica",
+ "nixpkgs"
+ ]
},
"locked": {
- "lastModified": 1707569094,
- "narHash": "sha256-HhLAu5EmtEzI8Wauc4bPpPODKbgEd6+6hPM9kn3LESM=",
+ "lastModified": 1716628408,
+ "narHash": "sha256-owaGnYzy8NQxaB9KpdsMdDJ5i2WWb9OBrCmAlrdY9OA=",
"ref": "refs/heads/master",
- "rev": "10339966aa1108ee3e2e77ecb8cda0799f92f4e8",
- "revCount": 66,
+ "rev": "1ff3a6b692dbb3fe21533e84502d5c1f4790c4a9",
+ "revCount": 101,
"type": "git",
"url": "https://gitlab.horizon-haskell.net/ghc/horizon-ghc"
},
@@ -185,23 +221,118 @@
"url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
}
},
+ "horizon-hoogle_3": {
+ "locked": {
+ "lastModified": 1701521742,
+ "narHash": "sha256-huf/95jYL7mY0AHSziJYXx4m/sP+G+YAbJb+Q5Ph/Jg=",
+ "ref": "refs/heads/master",
+ "rev": "ddf3b08c6458c1a9e0d881f968c050bc828b9b8e",
+ "revCount": 2,
+ "type": "git",
+ "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
+ },
+ "original": {
+ "type": "git",
+ "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
+ }
+ },
+ "horizon-platform": {
+ "inputs": {
+ "flake-parts": "flake-parts_2",
+ "horizon-advance": "horizon-advance",
+ "horizon-hoogle": "horizon-hoogle_3",
+ "nixpkgs": "nixpkgs_4"
+ },
+ "locked": {
+ "lastModified": 1716979826,
+ "narHash": "sha256-yRJ9t2Hjx591D+l5OwIXH1Yc9I/OStpOufKhcE5jFu8=",
+ "ref": "refs/heads/master",
+ "rev": "1c4d0f1fcc0beca407fceffedaa1fe290efe627e",
+ "revCount": 1333,
+ "type": "git",
+ "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-platform"
+ },
+ "original": {
+ "type": "git",
+ "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-platform"
+ }
+ },
+ "lint-utils": {
+ "inputs": {
+ "flake-utils": "flake-utils",
+ "nixpkgs": [
+ "horizon-platform",
+ "horizon-advance",
+ "horizon-core",
+ "horizon-build-packages",
+ "horizon-ghc",
+ "nixica",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1708583908,
+ "narHash": "sha256-zuNxxkt/wS8Z5TbGarf4QZVDt1R65dDkEw/s2T/tCW4=",
+ "owner": "homotopic",
+ "repo": "lint-utils",
+ "rev": "2d77caa3644065ee0f462cc5ea654280c59127b2",
+ "type": "github"
+ },
+ "original": {
+ "owner": "homotopic",
+ "repo": "lint-utils",
+ "type": "github"
+ }
+ },
+ "nixica": {
+ "inputs": {
+ "flake-parts": "flake-parts_3",
+ "lint-utils": "lint-utils",
+ "nixpkgs": "nixpkgs"
+ },
+ "locked": {
+ "lastModified": 1709796500,
+ "narHash": "sha256-No1tx+wo5DjOCPAF6ayhQlRMB3jD6kKdp/9bh/dSN9c=",
+ "ref": "refs/heads/master",
+ "rev": "688f425ae7fdc0bb76b907863d27c5efaa19ce8a",
+ "revCount": 17,
+ "type": "git",
+ "url": "https://gitlab.horizon-haskell.net/nix/nixica-library"
+ },
+ "original": {
+ "type": "git",
+ "url": "https://gitlab.horizon-haskell.net/nix/nixica-library"
+ }
+ },
"nixpkgs": {
"locked": {
- "lastModified": 1707268954,
- "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
- "owner": "nixos",
+ "lastModified": 1708992772,
+ "narHash": "sha256-TWy2VNWAzNOPbZ1InbJtm7GYOyIG/BWKPCwmNDCnDLs=",
+ "owner": "NixOS",
"repo": "nixpkgs",
- "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
+ "rev": "7e5ed63169046d8250ded004cfbd5f8b13b264e7",
"type": "github"
},
"original": {
- "owner": "nixos",
- "ref": "nixos-unstable",
+ "owner": "NixOS",
+ "ref": "haskell-updates",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
+ "locked": {
+ "lastModified": 1714640452,
+ "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=",
+ "type": "tarball",
+ "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
+ },
+ "original": {
+ "type": "tarball",
+ "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
+ }
+ },
+ "nixpkgs-lib_2": {
"locked": {
"dir": "lib",
"lastModified": 1706550542,
@@ -219,7 +350,7 @@
"type": "github"
}
},
- "nixpkgs-lib_2": {
+ "nixpkgs-lib_3": {
"locked": {
"dir": "lib",
"lastModified": 1706550542,
@@ -237,47 +368,61 @@
"type": "github"
}
},
- "nixpkgs-lib_3": {
+ "nixpkgs_2": {
"locked": {
- "dir": "lib",
- "lastModified": 1706550542,
- "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
+ "lastModified": 1716596003,
+ "narHash": "sha256-WW4LMtqDXBqXQ1TlMpCYZhpkwxQsr77RvLb8UfdaSXs=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
+ "rev": "edc6c261ab4ffb277af409e37a52718a91b255bc",
"type": "github"
},
"original": {
- "dir": "lib",
"owner": "NixOS",
- "ref": "nixos-unstable",
+ "ref": "haskell-updates",
"repo": "nixpkgs",
"type": "github"
}
},
- "nixpkgs_2": {
+ "nixpkgs_3": {
+ "locked": {
+ "lastModified": 1716596003,
+ "narHash": "sha256-WW4LMtqDXBqXQ1TlMpCYZhpkwxQsr77RvLb8UfdaSXs=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "edc6c261ab4ffb277af409e37a52718a91b255bc",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "haskell-updates",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_4": {
"locked": {
- "lastModified": 1707268954,
- "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
+ "lastModified": 1708093448,
+ "narHash": "sha256-gohEm3/NVyu7WINFhRf83yJH8UM2ie/KY9Iw3VN6fiE=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
+ "rev": "c7763249f02b7786b4ca36e13a4d7365cfba162f",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-unstable",
+ "ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
- "nixpkgs_3": {
+ "nixpkgs_5": {
"locked": {
- "lastModified": 1707956935,
- "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=",
+ "lastModified": 1716769173,
+ "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c",
+ "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632",
"type": "github"
},
"original": {
@@ -290,8 +435,8 @@
"root": {
"inputs": {
"flake-parts": "flake-parts",
- "horizon-advance": "horizon-advance",
- "nixpkgs": "nixpkgs_3"
+ "horizon-platform": "horizon-platform",
+ "nixpkgs": "nixpkgs_5"
}
}
},
diff --git a/flake.nix b/flake.nix
index a5998f474647c6509f77e61daccddbffac3479f3..02d306de5fb2280bc463e4c584f2829622bd8f0a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,19 +8,13 @@
inputs = {
flake-parts.url = "github:hercules-ci/flake-parts";
- horizon-advance.url = "git+https://gitlab.horizon-haskell.net/package-sets/horizon-advance";
+ horizon-platform.url = "git+https://gitlab.horizon-haskell.net/package-sets/horizon-platform";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
};
outputs =
- inputs@
- { self
- , flake-parts
- , horizon-advance
- , nixpkgs
- , ...
- }:
- flake-parts.lib.mkFlake { inherit inputs; } {
+ inputs:
+ inputs.flake-parts.lib.mkFlake { inherit inputs; } {
systems = [
"aarch64-darwin"
"x86_64-darwin"
@@ -30,12 +24,13 @@
with pkgs.lib;
let
+ modifiers = import ./modifiers.nix { inherit pkgs; };
overrides = composeManyExtensions [
- (import ./overlay.nix { inherit pkgs; })
+ (import ./overlay.nix { inherit pkgs; f = modifiers; })
(import ./configuration.nix { inherit pkgs; })
];
- legacyPackages = horizon-advance.legacyPackages.${system}.extend overrides;
+ legacyPackages = inputs.horizon-platform.legacyPackages.${system}.extend overrides;
packages = filterAttrs (_: isDerivation) legacyPackages;
diff --git a/horizon.dhall b/horizon.dhall
index e6413d93479ee203c70af2e8ca524dd1abbb98b0..c54fcc84f8bacc5b743e1e8e05f9c87f901fb1a5 100644
--- a/horizon.dhall
+++ b/horizon.dhall
@@ -15,24 +15,13 @@ let packages =
, bits = H.callHackage "bits" "0.6"
, blastxml = H.callHackage "blastxml" "0.3.2"
, cereal-text = H.callHackage "cereal-text" "0.1.0.2"
- , fgl = H.callHackage "fgl" "5.8.1.1"
, hPDB = H.callHackage "hPDB" "1.5.0.0"
, intern = H.callHackage "intern" "0.9.4"
, iterable = H.callHackage "iterable" "3.0"
, log-domain = H.callHackage "log-domain" "0.13.2"
, memexml = H.callHackage "memexml" "0.0.3"
- , microbench = H.callHackage "microbench" "0.1"
- , mmap = H.callHackage "mmap" "0.5.9"
- , pipes = H.callHackage "pipes" "4.3.16"
- , pipes-bytestring = H.callHackage "pipes-bytestring" "2.1.7"
- , pipes-group = H.callHackage "pipes-group" "1.0.12"
- , pipes-parse = H.callHackage "pipes-parse" "3.0.9"
- , streaming = H.callHackage "streaming" "0.2.4.0"
- , streaming-bytestring = H.callHackage "streaming-bytestring" "0.3.1"
, stringable = H.callHackage "stringable" "0.1.3"
- , stringsearch = H.callHackage "stringsearch" "0.3.6.6"
, text-binary = H.callHackage "text-binary" "0.2.1.1"
- , timeit = H.callHackage "timeit" "2.0"
}
in H.HorizonExport.MakeOverlay
diff --git a/horizon.lock b/horizon.lock
index 59819b7371cc0bdca0e3ff02c3b9f64f397c474b..5ad2e9944246efce45b56e601fefe6106509bf1b 100644
--- a/horizon.lock
+++ b/horizon.lock
@@ -50,10 +50,6 @@
, mapValue =
"a927dc45804b63a8f75f7432e6b87ecd09421f2dda58937a4824b612a26c236b"
}
-, { mapKey = "fgl"
- , mapValue =
- "4ed82b14fbf12babaa900199d22462a1d793ea6282c1eb354a162c2efee1c722"
- }
, { mapKey = "hPDB"
, mapValue =
"4f651e0e201e5bc422a71d1a2b5f6246ead7123e6774f0d7c424081493c6e584"
@@ -74,52 +70,12 @@
, mapValue =
"a13fd285ec121fbba353687c602ce1913cd084fc085cbb77b1acea858f614ac3"
}
-, { mapKey = "microbench"
- , mapValue =
- "4044184e9cd9f04c3001c29bd807bcd416925d3eb5d986b3d8fc7307fb90a56b"
- }
-, { mapKey = "mmap"
- , mapValue =
- "3277971beff3038234d088a2b645d1813994d9b59643c63a716c71901ed9df99"
- }
-, { mapKey = "pipes"
- , mapValue =
- "25315456b65afbfaf6f7cafcf1dc71b38d6783e9fb7deae1c79612b8a177a0aa"
- }
-, { mapKey = "pipes-bytestring"
- , mapValue =
- "5af3cf277ce2c24bb479b8dca649764eee33f5678f1e97ccd8603d900ed0b8e4"
- }
-, { mapKey = "pipes-group"
- , mapValue =
- "cd5485321b2500dd2439f77e54b53800dd85a5b5a9d4a03bc87d42527daa53b1"
- }
-, { mapKey = "pipes-parse"
- , mapValue =
- "1aeb4627b6d90d2e6a6c032932cc6d52cbfbe433264ebd3011cb89a48f433e08"
- }
-, { mapKey = "streaming"
- , mapValue =
- "2118746eaa01cc20b8b760fd11a39eb64479e1c4688feb487e51474893783b03"
- }
-, { mapKey = "streaming-bytestring"
- , mapValue =
- "38339a5f63f315c4ac5832f23f16bf44c5824c763e781a7d372dd5412292284b"
- }
, { mapKey = "stringable"
, mapValue =
"a092d279593143ad2b91de87036f162c0dc49e8f0c213c1384432542474565df"
}
-, { mapKey = "stringsearch"
- , mapValue =
- "c5de85116d294b0ae327cd376664b28bd8cd15b94e1c1ad10dc9903e3d8bbf67"
- }
, { mapKey = "text-binary"
, mapValue =
"5bddae81dffee094b6d5fe420597bd24bbd03a083ea47e866ff07eb9c05585e7"
}
-, { mapKey = "timeit"
- , mapValue =
- "cfd6da14417678b7dff28fa9f4890259f8f2c0221a271bd7220c13217aaf26bc"
- }
]
\ No newline at end of file
diff --git a/modifiers.nix b/modifiers.nix
new file mode 100644
index 0000000000000000000000000000000000000000..a861a45d837a368db1f34029ad2182cb8eb8e10e
--- /dev/null
+++ b/modifiers.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+with pkgs.lib;
+
+_: prev: name: v: if hasAttr name prev then warn "${name} exists in parent set" v else v
diff --git a/overlay.nix b/overlay.nix
index ab7a22a47ac8b1a712ccabfd5ce8a379399cf455..0499d322e397f768c4c213e0b5d7e8ad3a9cd1f5 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -1,66 +1,45 @@
-{ pkgs, ... }:
+/* This file is auto-generated by horizon-gen-nix. Do not edit. */
+{ pkgs, f ? (final: prev: n: v: v), ... }:
final: prev: with pkgs.haskell.lib; {
- BiobaseENA = final.callPackage (./pkgs/BiobaseENA.nix) { };
+ BiobaseENA = f final prev "BiobaseENA" (final.callPackage (./pkgs/BiobaseENA.nix) { });
- BiobaseTypes = final.callPackage (./pkgs/BiobaseTypes.nix) { };
+ BiobaseTypes = f final prev "BiobaseTypes" (final.callPackage (./pkgs/BiobaseTypes.nix) { });
- DPutils = final.callPackage (./pkgs/DPutils.nix) { };
+ DPutils = f final prev "DPutils" (final.callPackage (./pkgs/DPutils.nix) { });
- ForestStructures = final.callPackage (./pkgs/ForestStructures.nix) { };
+ ForestStructures = f final prev "ForestStructures" (final.callPackage (./pkgs/ForestStructures.nix) { });
- Octree = final.callPackage (./pkgs/Octree.nix) { };
+ Octree = f final prev "Octree" (final.callPackage (./pkgs/Octree.nix) { });
- OrderedBits = final.callPackage (./pkgs/OrderedBits.nix) { };
+ OrderedBits = f final prev "OrderedBits" (final.callPackage (./pkgs/OrderedBits.nix) { });
- PrimitiveArray = final.callPackage (./pkgs/PrimitiveArray.nix) { };
+ PrimitiveArray = f final prev "PrimitiveArray" (final.callPackage (./pkgs/PrimitiveArray.nix) { });
- SciBaseTypes = final.callPackage (./pkgs/SciBaseTypes.nix) { };
+ SciBaseTypes = f final prev "SciBaseTypes" (final.callPackage (./pkgs/SciBaseTypes.nix) { });
- bimaps = final.callPackage (./pkgs/bimaps.nix) { };
+ bimaps = f final prev "bimaps" (final.callPackage (./pkgs/bimaps.nix) { });
- biocore = final.callPackage (./pkgs/biocore.nix) { };
+ biocore = f final prev "biocore" (final.callPackage (./pkgs/biocore.nix) { });
- bits = final.callPackage (./pkgs/bits.nix) { };
+ bits = f final prev "bits" (final.callPackage (./pkgs/bits.nix) { });
- blastxml = final.callPackage (./pkgs/blastxml.nix) { };
+ blastxml = f final prev "blastxml" (final.callPackage (./pkgs/blastxml.nix) { });
- cereal-text = final.callPackage (./pkgs/cereal-text.nix) { };
+ cereal-text = f final prev "cereal-text" (final.callPackage (./pkgs/cereal-text.nix) { });
- fgl = final.callPackage (./pkgs/fgl.nix) { };
+ hPDB = f final prev "hPDB" (final.callPackage (./pkgs/hPDB.nix) { });
- hPDB = final.callPackage (./pkgs/hPDB.nix) { };
+ intern = f final prev "intern" (final.callPackage (./pkgs/intern.nix) { });
- intern = final.callPackage (./pkgs/intern.nix) { };
+ iterable = f final prev "iterable" (final.callPackage (./pkgs/iterable.nix) { });
- iterable = final.callPackage (./pkgs/iterable.nix) { };
+ log-domain = f final prev "log-domain" (final.callPackage (./pkgs/log-domain.nix) { });
- log-domain = final.callPackage (./pkgs/log-domain.nix) { };
+ memexml = f final prev "memexml" (final.callPackage (./pkgs/memexml.nix) { });
- memexml = final.callPackage (./pkgs/memexml.nix) { };
+ stringable = f final prev "stringable" (final.callPackage (./pkgs/stringable.nix) { });
- microbench = final.callPackage (./pkgs/microbench.nix) { };
-
- mmap = final.callPackage (./pkgs/mmap.nix) { };
-
- pipes = final.callPackage (./pkgs/pipes.nix) { };
-
- pipes-bytestring = final.callPackage (./pkgs/pipes-bytestring.nix) { };
-
- pipes-group = final.callPackage (./pkgs/pipes-group.nix) { };
-
- pipes-parse = final.callPackage (./pkgs/pipes-parse.nix) { };
-
- streaming = final.callPackage (./pkgs/streaming.nix) { };
-
- streaming-bytestring = final.callPackage (./pkgs/streaming-bytestring.nix) { };
-
- stringable = final.callPackage (./pkgs/stringable.nix) { };
-
- stringsearch = final.callPackage (./pkgs/stringsearch.nix) { };
-
- text-binary = final.callPackage (./pkgs/text-binary.nix) { };
-
- timeit = final.callPackage (./pkgs/timeit.nix) { };
+ text-binary = f final prev "text-binary" (final.callPackage (./pkgs/text-binary.nix) { });
}
diff --git a/pkgs/fgl.nix b/pkgs/fgl.nix
deleted file mode 100644
index 5689294b7263fe4e79e1f6ca957141c3ae016df3..0000000000000000000000000000000000000000
--- a/pkgs/fgl.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, QuickCheck, array, base, containers, deepseq, hspec
-, lib, microbench, transformers
-}:
-mkDerivation {
- pname = "fgl";
- version = "5.8.1.1";
- sha256 = "6908fd6ecb010c83d103a296b970eb82f7b9c914059afd6002d39a720a6a8cad";
- revision = "1";
- editedCabalFile = "1f87gq1mgvwmjz2xdkbgpwy9y44vsgzzkvn8dm1a8nqq62x0cmiv";
- isLibrary = true;
- isExecutable = false;
- enableSeparateDataOutput = false;
- libraryHaskellDepends = [
- array base containers deepseq transformers
- ];
- testHaskellDepends = [ base containers hspec QuickCheck ];
- benchmarkHaskellDepends = [ base deepseq microbench ];
- enableLibraryProfiling = true;
- enableExecutableProfiling = true;
- doHaddock = true;
- jailbreak = true;
- doCheck = false;
- doBenchmark = false;
- hyperlinkSource = false;
- description = "Martin Erwig's Functional Graph Library";
- license = lib.licenses.bsd3;
- broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/microbench.nix b/pkgs/microbench.nix
deleted file mode 100644
index 15f230e2bebc7346bec5659fc01c2cd40e6c64cd..0000000000000000000000000000000000000000
--- a/pkgs/microbench.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, base, lib, time }:
-mkDerivation {
- pname = "microbench";
- version = "0.1";
- sha256 = "6fee3c592c9afb72bd7b5574872119464055b717491c612ffee7f57c8e85d717";
- isLibrary = true;
- isExecutable = false;
- enableSeparateDataOutput = false;
- libraryHaskellDepends = [ base time ];
- enableLibraryProfiling = true;
- enableExecutableProfiling = true;
- doHaddock = true;
- jailbreak = true;
- doCheck = false;
- doBenchmark = false;
- hyperlinkSource = false;
- homepage = "http://neugierig.org/software/darcs/browse/?r=microbench;a=summary";
- description = "Microbenchmark Haskell code";
- license = lib.licenses.bsd3;
- broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/mmap.nix b/pkgs/mmap.nix
deleted file mode 100644
index f67905967bc9ce88910a04a51792165d083b995c..0000000000000000000000000000000000000000
--- a/pkgs/mmap.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, bytestring, lib }:
-mkDerivation {
- pname = "mmap";
- version = "0.5.9";
- sha256 = "58fcbb04e1cb8e7c36c05823b02dce2faaa989c53d745a7f36192de2fc98b5f8";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = false;
- libraryHaskellDepends = [ base bytestring ];
- enableLibraryProfiling = true;
- enableExecutableProfiling = true;
- doHaddock = true;
- jailbreak = true;
- doCheck = false;
- doBenchmark = false;
- hyperlinkSource = false;
- description = "Memory mapped files for POSIX and Windows";
- license = lib.licenses.bsd3;
- broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/pipes-bytestring.nix b/pkgs/pipes-bytestring.nix
deleted file mode 100644
index c967fe0564f79e06ed28a22a936b6d52278bec31..0000000000000000000000000000000000000000
--- a/pkgs/pipes-bytestring.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, bytestring, lib, pipes, pipes-group
-, pipes-parse, stringsearch, transformers
-}:
-mkDerivation {
- pname = "pipes-bytestring";
- version = "2.1.7";
- sha256 = "6c77863e8ad809f3b86e9e0cf8c553056a8ef12bb2691f8031c5917d0b090732";
- revision = "3";
- editedCabalFile = "0a5mp98prbpn5pqpab0h3xinhh9vnjqhlss44zq9dbvxw14agxak";
- isLibrary = true;
- isExecutable = false;
- enableSeparateDataOutput = false;
- libraryHaskellDepends = [
- base bytestring pipes pipes-group pipes-parse stringsearch
- transformers
- ];
- enableLibraryProfiling = true;
- enableExecutableProfiling = true;
- doHaddock = true;
- jailbreak = true;
- doCheck = false;
- doBenchmark = false;
- hyperlinkSource = false;
- description = "ByteString support for pipes";
- license = lib.licenses.bsd3;
- broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/pipes-group.nix b/pkgs/pipes-group.nix
deleted file mode 100644
index fdefc8bed51828f92507684e962f42e2ddfeba4e..0000000000000000000000000000000000000000
--- a/pkgs/pipes-group.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, doctest, free, lens-family-core, lib, pipes
-, pipes-parse, transformers
-}:
-mkDerivation {
- pname = "pipes-group";
- version = "1.0.12";
- sha256 = "1373e89fbeb127c31461042cdda848da2048eda2700ddbd872d444af87745ac7";
- revision = "9";
- editedCabalFile = "1i0l182q4gxq29g5w8iv3ywq68dq3gcyhjybfrih0q0cnyz8zxlc";
- isLibrary = true;
- isExecutable = false;
- enableSeparateDataOutput = false;
- libraryHaskellDepends = [
- base free pipes pipes-parse transformers
- ];
- testHaskellDepends = [ base doctest lens-family-core ];
- enableLibraryProfiling = true;
- enableExecutableProfiling = true;
- doHaddock = true;
- jailbreak = true;
- doCheck = false;
- doBenchmark = false;
- hyperlinkSource = false;
- description = "Group streams into substreams";
- license = lib.licenses.bsd3;
- broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/pipes-parse.nix b/pkgs/pipes-parse.nix
deleted file mode 100644
index 593be911772bcb83781915c84532f90235123172..0000000000000000000000000000000000000000
--- a/pkgs/pipes-parse.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ mkDerivation, base, lib, pipes, transformers }:
-mkDerivation {
- pname = "pipes-parse";
- version = "3.0.9";
- sha256 = "a3973f9b01d68cce75d6c5b049fe5dbff6d4f6753019349ccff5cfad82048d15";
- revision = "2";
- editedCabalFile = "0dil8dqjx4l1d065rcixhbri1j40ppip6kfl22kxgyx96hz0vzfh";
- isLibrary = true;
- isExecutable = false;
- enableSeparateDataOutput = false;
- libraryHaskellDepends = [ base pipes transformers ];
- enableLibraryProfiling = true;
- enableExecutableProfiling = true;
- doHaddock = true;
- jailbreak = true;
- doCheck = false;
- doBenchmark = false;
- hyperlinkSource = false;
- description = "Parsing infrastructure for the pipes ecosystem";
- license = lib.licenses.bsd3;
- broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/pipes.nix b/pkgs/pipes.nix
deleted file mode 100644
index f49dd87b727dd95fc243f2f06f16722e89b2719b..0000000000000000000000000000000000000000
--- a/pkgs/pipes.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ mkDerivation, QuickCheck, base, criterion, exceptions, lib
-, mmorph, mtl, optparse-applicative, test-framework
-, test-framework-quickcheck2, transformers, void
-}:
-mkDerivation {
- pname = "pipes";
- version = "4.3.16";
- sha256 = "f4e16ecf010fd681a56e6216ab1bd429f3c9bc962ec032e32cfd23e374e97498";
- revision = "6";
- editedCabalFile = "16s8a1ijakhsk73ny2vrw6a8r2dszgncd0wk735ii6csg3l2c9pm";
- isLibrary = true;
- isExecutable = false;
- enableSeparateDataOutput = false;
- libraryHaskellDepends = [
- base exceptions mmorph mtl transformers void
- ];
- testHaskellDepends = [
- base mtl QuickCheck test-framework test-framework-quickcheck2
- transformers
- ];
- benchmarkHaskellDepends = [
- base criterion mtl optparse-applicative transformers
- ];
- enableLibraryProfiling = true;
- enableExecutableProfiling = true;
- doHaddock = true;
- jailbreak = true;
- doCheck = false;
- doBenchmark = false;
- hyperlinkSource = false;
- description = "Compositional pipelines";
- license = lib.licenses.bsd3;
- broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/streaming-bytestring.nix b/pkgs/streaming-bytestring.nix
deleted file mode 100644
index beb6256974939ea8c1f4a6e8ac9b75469facc4a8..0000000000000000000000000000000000000000
--- a/pkgs/streaming-bytestring.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim
-, lib, mmorph, mtl, resourcet, smallcheck, streaming, tasty
-, tasty-hunit, tasty-smallcheck, transformers, transformers-base
-}:
-mkDerivation {
- pname = "streaming-bytestring";
- version = "0.3.1";
- sha256 = "62c472974bebc5a23c684d189335f1375e2a3fbd43c8ea1cfc69821c14d2065e";
- isLibrary = true;
- isExecutable = false;
- enableSeparateDataOutput = false;
- libraryHaskellDepends = [
- base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet
- streaming transformers transformers-base
- ];
- testHaskellDepends = [
- base bytestring resourcet smallcheck streaming tasty tasty-hunit
- tasty-smallcheck transformers
- ];
- enableLibraryProfiling = true;
- enableExecutableProfiling = true;
- doHaddock = true;
- jailbreak = true;
- doCheck = false;
- doBenchmark = false;
- hyperlinkSource = false;
- homepage = "https://github.com/haskell-streaming/streaming-bytestring";
- description = "Fast, effectful byte streams";
- license = lib.licenses.bsd3;
- broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/streaming.nix b/pkgs/streaming.nix
deleted file mode 100644
index a5f2beb887dc35b6f6150982a89e215fc3e4a7f5..0000000000000000000000000000000000000000
--- a/pkgs/streaming.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, QuickCheck, base, containers, ghc-prim, hspec, lib
-, mmorph, mtl, transformers, transformers-base
-}:
-mkDerivation {
- pname = "streaming";
- version = "0.2.4.0";
- sha256 = "caddfba744a057174f94b3c2e6bce2d31f6bb7c436df0c0920269336f132dde0";
- isLibrary = true;
- isExecutable = false;
- enableSeparateDataOutput = false;
- libraryHaskellDepends = [
- base containers ghc-prim mmorph mtl transformers transformers-base
- ];
- testHaskellDepends = [ base hspec QuickCheck ];
- enableLibraryProfiling = true;
- enableExecutableProfiling = true;
- doHaddock = true;
- jailbreak = true;
- doCheck = false;
- doBenchmark = false;
- hyperlinkSource = false;
- homepage = "https://github.com/haskell-streaming/streaming";
- description = "an elementary streaming prelude and general stream type";
- license = lib.licenses.bsd3;
- broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/stringsearch.nix b/pkgs/stringsearch.nix
deleted file mode 100644
index 2ece9d52d0be77ccf9303c6f91c5f6cde7df256f..0000000000000000000000000000000000000000
--- a/pkgs/stringsearch.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, array, base, bytestring, containers, lib }:
-mkDerivation {
- pname = "stringsearch";
- version = "0.3.6.6";
- sha256 = "295f1971920bc52263d8275d7054ad223a7e1aefe75533f9887735c9644ffe4a";
- revision = "1";
- editedCabalFile = "0z5pz5dccapz9k39r2zmf056m0x2m2lj3jahhnw3mfxlmps07378";
- isLibrary = true;
- isExecutable = false;
- enableSeparateDataOutput = false;
- libraryHaskellDepends = [ array base bytestring containers ];
- enableLibraryProfiling = true;
- enableExecutableProfiling = true;
- doHaddock = true;
- jailbreak = true;
- doCheck = false;
- doBenchmark = false;
- hyperlinkSource = false;
- homepage = "https://bitbucket.org/dafis/stringsearch";
- description = "Fast searching, splitting and replacing of ByteStrings";
- license = lib.licenses.bsd3;
- broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/timeit.nix b/pkgs/timeit.nix
deleted file mode 100644
index 42a66ab59d2469a11377e0b27f7c325109ee1371..0000000000000000000000000000000000000000
--- a/pkgs/timeit.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ mkDerivation, base, lib }:
-mkDerivation {
- pname = "timeit";
- version = "2.0";
- sha256 = "a14df4e578db371e5c609f0784209144545f9cae90026d24a3398042f7c591ea";
- revision = "2";
- editedCabalFile = "1vgxfk2021jh6jk3dimchmf9f71844zj080342qvnn5lck7c7mrm";
- isLibrary = true;
- isExecutable = false;
- enableSeparateDataOutput = false;
- libraryHaskellDepends = [ base ];
- enableLibraryProfiling = true;
- enableExecutableProfiling = true;
- doHaddock = true;
- jailbreak = true;
- doCheck = false;
- doBenchmark = false;
- hyperlinkSource = false;
- homepage = "https://github.com/merijn/timeit";
- description = "Time monadic computations with an IO base";
- license = lib.licenses.bsd3;
- broken = false;
-}
\ No newline at end of file