diff --git a/develop/flake.lock b/develop/flake.lock index 7585e028790225275c82363d0769469d5e08d530..2dfe9ea9a8948791784adb2aa31c20c3ce7efba9 100644 --- a/develop/flake.lock +++ b/develop/flake.lock @@ -18,11 +18,11 @@ }, "crazyshell": { "inputs": { - "flake-utils": "flake-utils_7", - "get-flake": "get-flake_3", + "flake-utils": "flake-utils_9", + "get-flake": "get-flake_2", "horizon-core": "horizon-core_2", - "lint-utils": "lint-utils_6", - "nixpkgs": "nixpkgs_11" + "lint-utils": "lint-utils_8", + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1697046007, @@ -129,6 +129,24 @@ "type": "github" } }, + "flake-parts_10": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_10" + }, + "locked": { + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" @@ -170,11 +188,11 @@ "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { - "lastModified": 1683560683, - "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "006c75898cf814ef9497252b022e91c946ba8e17", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", "type": "github" }, "original": { @@ -188,11 +206,11 @@ "nixpkgs-lib": "nixpkgs-lib_5" }, "locked": { - "lastModified": 1683560683, - "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "006c75898cf814ef9497252b022e91c946ba8e17", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", "type": "github" }, "original": { @@ -205,6 +223,24 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib_6" }, + "locked": { + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_7": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_7" + }, "locked": { "lastModified": 1683560683, "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", @@ -219,6 +255,42 @@ "type": "github" } }, + "flake-parts_8": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_8" + }, + "locked": { + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_9": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_9" + }, + "locked": { + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-to-gitlab-ci": { "inputs": { "flake-parts": "flake-parts_2", @@ -260,15 +332,45 @@ } }, "flake-utils_10": { + "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_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_12": { "inputs": { "systems": "systems_4" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -277,7 +379,7 @@ "type": "github" } }, - "flake-utils_11": { + "flake-utils_13": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -292,7 +394,37 @@ "type": "github" } }, - "flake-utils_12": { + "flake-utils_14": { + "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_15": { + "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_16": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -342,11 +474,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -386,15 +518,12 @@ } }, "flake-utils_7": { - "inputs": { - "systems": "systems_3" - }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -419,12 +548,15 @@ } }, "flake-utils_9": { + "inputs": { + "systems": "systems_3" + }, "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -449,21 +581,6 @@ } }, "get-flake_2": { - "locked": { - "lastModified": 1673819588, - "narHash": "sha256-gRtwKAlu4htvS6dxyZnW3n+vMS1acqnMGVHqxUdETeY=", - "owner": "ursi", - "repo": "get-flake", - "rev": "e0917b6f564aa5acefb1484b5baf76da21746c3c", - "type": "github" - }, - "original": { - "owner": "ursi", - "repo": "get-flake", - "type": "github" - } - }, - "get-flake_3": { "locked": { "lastModified": 1694475786, "narHash": "sha256-s5wDmPooMUNIAAsxxCMMh9g68AueGg63DYk2hVZJbc8=", @@ -478,22 +595,7 @@ "type": "github" } }, - "get-flake_4": { - "locked": { - "lastModified": 1673819588, - "narHash": "sha256-gRtwKAlu4htvS6dxyZnW3n+vMS1acqnMGVHqxUdETeY=", - "owner": "ursi", - "repo": "get-flake", - "rev": "e0917b6f564aa5acefb1484b5baf76da21746c3c", - "type": "github" - }, - "original": { - "owner": "ursi", - "repo": "get-flake", - "type": "github" - } - }, - "get-flake_5": { + "get-flake_3": { "locked": { "lastModified": 1673819588, "narHash": "sha256-gRtwKAlu4htvS6dxyZnW3n+vMS1acqnMGVHqxUdETeY=", @@ -511,6 +613,7 @@ "gitignore": { "inputs": { "nixpkgs": [ + "horizon-develop-flake", "feedback", "pre-commit-hooks", "nixpkgs" @@ -530,19 +633,62 @@ "type": "github" } }, + "horizon-build-packages": { + "inputs": { + "flake-parts": "flake-parts_5", + "horizon-ghc": "horizon-ghc", + "lint-utils": "lint-utils_4", + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "lastModified": 1701564295, + "narHash": "sha256-ibYE2ZnXBLDlZax5YkDeCsK4uw+8G/34ryotBut0IHY=", + "ref": "refs/heads/master", + "rev": "f9c03cb2e31af63709cde8b4b6421b0e3c6d42fc", + "revCount": 6, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-build-packages" + }, + "original": { + "type": "git", + "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-build-packages" + } + }, + "horizon-build-packages_2": { + "inputs": { + "flake-parts": "flake-parts_9", + "horizon-ghc": "horizon-ghc_2", + "lint-utils": "lint-utils_10", + "nixpkgs": "nixpkgs_19" + }, + "locked": { + "lastModified": 1701564295, + "narHash": "sha256-ibYE2ZnXBLDlZax5YkDeCsK4uw+8G/34ryotBut0IHY=", + "ref": "refs/heads/master", + "rev": "f9c03cb2e31af63709cde8b4b6421b0e3c6d42fc", + "revCount": 6, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-build-packages" + }, + "original": { + "type": "git", + "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-build-packages" + } + }, "horizon-core": { "inputs": { "flake-parts": "flake-parts_4", - "get-flake": "get-flake_2", - "lint-utils": "lint-utils_3", - "nixpkgs": "nixpkgs_7" + "horizon-build-packages": "horizon-build-packages", + "horizon-hoogle": "horizon-hoogle", + "lint-utils": "lint-utils_5", + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1697043887, - "narHash": "sha256-+ts9eNlYP5EuPXIIrJHbCn+1+5gjU9BphDHs6VNyVec=", + "lastModified": 1702987897, + "narHash": "sha256-DnGXyb2KFO5Dvo6hmzvJwaA8v6tm9MLmC3HaUHJV5vE=", "ref": "refs/heads/master", - "rev": "f8238d98b143e2b0e7d2044a587df79293b255af", - "revCount": 1109, + "rev": "da32f93ae07d4333aca28fd82003ecdd07201d54", + "revCount": 1228, "type": "git", "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core" }, @@ -553,10 +699,10 @@ }, "horizon-core_2": { "inputs": { - "flake-parts": "flake-parts_5", - "get-flake": "get-flake_4", - "lint-utils": "lint-utils_5", - "nixpkgs": "nixpkgs_10" + "flake-parts": "flake-parts_7", + "get-flake": "get-flake_3", + "lint-utils": "lint-utils_7", + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1697043887, @@ -574,17 +720,18 @@ }, "horizon-core_3": { "inputs": { - "flake-parts": "flake-parts_6", - "get-flake": "get-flake_5", - "lint-utils": "lint-utils_7", - "nixpkgs": "nixpkgs_13" + "flake-parts": "flake-parts_8", + "horizon-build-packages": "horizon-build-packages_2", + "horizon-hoogle": "horizon-hoogle_2", + "lint-utils": "lint-utils_11", + "nixpkgs": "nixpkgs_21" }, "locked": { - "lastModified": 1697043887, - "narHash": "sha256-+ts9eNlYP5EuPXIIrJHbCn+1+5gjU9BphDHs6VNyVec=", + "lastModified": 1701564656, + "narHash": "sha256-pfpZwQG/jsytUxhh2i1QlruaHfLouUYUqK2muLLvRZE=", "ref": "refs/heads/master", - "rev": "f8238d98b143e2b0e7d2044a587df79293b255af", - "revCount": 1109, + "rev": "94bae51d90c2a5e5fd89fe45285a10c36e98b0cd", + "revCount": 1222, "type": "git", "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core" }, @@ -593,29 +740,120 @@ "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core" } }, - "horizon-gen-nix": { + "horizon-develop-flake": { "inputs": { - "flake-utils": "flake-utils_4", - "horizon-core": "horizon-core", - "lint-utils": "lint-utils_4", - "nixpkgs": "nixpkgs_8" + "feedback": "feedback", + "flake-to-gitlab-ci": "flake-to-gitlab-ci", + "horizon-gen-nix": "horizon-gen-nix", + "horizon-shell": "horizon-shell" }, "locked": { - "lastModified": 1698091055, - "narHash": "sha256-RxZRtv/ccP9lwcU54OQCFfgWK8C8eyKSbT+vW6Bl7ck=", - "ref": "refs/tags/0.11.0", - "rev": "0f5e5bad673d0c977246e6d96f39a6867e04fad3", - "revCount": 190, + "lastModified": 1703693706, + "narHash": "sha256-A6Y0Rc/UjQQ6dtUUd5N0ZS7plkgqUdkJgpJIQqGc0d0=", + "ref": "refs/heads/master", + "rev": "d66b7d0af9fd7bdb2e8ab4a6eb85c1fc3d4fe0b2", + "revCount": 12, "type": "git", - "url": "https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix" + "url": "https://gitlab.horizon-haskell.net/nix/horizon-develop-flake" }, "original": { - "ref": "refs/tags/0.11.0", "type": "git", - "url": "https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix" + "url": "https://gitlab.horizon-haskell.net/nix/horizon-develop-flake" } }, - "horizon-platform": { + "horizon-gen-nix": { + "inputs": { + "flake-utils": "flake-utils_4", + "horizon-core": "horizon-core", + "lint-utils": "lint-utils_6", + "nixpkgs": "nixpkgs_12" + }, + "locked": { + "lastModified": 1703437758, + "narHash": "sha256-vmvcRC5XaVDCvkqS7CtOs7zkIaoQN4kSVcxUISNAQls=", + "ref": "refs/tags/0.11.1", + "rev": "a4fdff8f2ad83b1406fecfef95e9f9d798da9bba", + "revCount": 194, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix" + }, + "original": { + "ref": "refs/tags/0.11.1", + "type": "git", + "url": "https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix" + } + }, + "horizon-ghc": { + "inputs": { + "flake-parts": "flake-parts_6", + "lint-utils": "lint-utils_3", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1701518837, + "narHash": "sha256-92faPC+q5EMNf37EGhdt9pvWWFi0mTq0Szk6wOyxyrQ=", + "ref": "refs/heads/master", + "rev": "0b35eb150bfc8ee338688adda23587521cd97da6", + "revCount": 6, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/ghc/horizon-ghc" + }, + "original": { + "type": "git", + "url": "https://gitlab.horizon-haskell.net/ghc/horizon-ghc" + } + }, + "horizon-ghc_2": { + "inputs": { + "flake-parts": "flake-parts_10", + "lint-utils": "lint-utils_9", + "nixpkgs": "nixpkgs_17" + }, + "locked": { + "lastModified": 1701518837, + "narHash": "sha256-92faPC+q5EMNf37EGhdt9pvWWFi0mTq0Szk6wOyxyrQ=", + "ref": "refs/heads/master", + "rev": "0b35eb150bfc8ee338688adda23587521cd97da6", + "revCount": 6, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/ghc/horizon-ghc" + }, + "original": { + "type": "git", + "url": "https://gitlab.horizon-haskell.net/ghc/horizon-ghc" + } + }, + "horizon-hoogle": { + "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-hoogle_2": { + "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_3", "get-flake": "get-flake", @@ -640,22 +878,22 @@ "horizon-shell": { "inputs": { "crazyshell": "crazyshell", - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_12", "horizon-core": "horizon-core_3", - "lint-utils": "lint-utils_8", - "nixpkgs": "nixpkgs_14" + "lint-utils": "lint-utils_12", + "nixpkgs": "nixpkgs_22" }, "locked": { - "lastModified": 1697281965, - "narHash": "sha256-VWAJWUyI3PI/7UKVJ9hkQNrC/NMcUHsqzMayAbfbXZc=", - "ref": "refs/tags/0.0.9", - "rev": "3201b990c51f924838c244cb5d8c5b1ba7b134c8", - "revCount": 36, + "lastModified": 1702983712, + "narHash": "sha256-k0eNLAcnpHxnxudigUJycqd2nBObhhb4IBptKnu9W3g=", + "ref": "refs/tags/0.0.11", + "rev": "9dbff2db2dcf41361ee150d4cf7fed696ae38c21", + "revCount": 41, "type": "git", "url": "https://gitlab.horizon-haskell.net/shells/horizon-shell" }, "original": { - "ref": "refs/tags/0.0.9", + "ref": "refs/tags/0.0.11", "type": "git", "url": "https://gitlab.horizon-haskell.net/shells/horizon-shell" } @@ -696,10 +934,72 @@ "url": "https://gitlab.homotopic.tech/nix/lint-utils" } }, + "lint-utils_10": { + "inputs": { + "flake-utils": "flake-utils_14", + "nixpkgs": "nixpkgs_18" + }, + "locked": { + "lastModified": 1699441004, + "narHash": "sha256-7v7CH8ZiB2RClPtpgDLfQxeR+14KXoFl2qTdXd27sL0=", + "ref": "refs/heads/master", + "rev": "226003d10c2d192b088f7c3c9ee7ca549c421a9c", + "revCount": 52, + "type": "git", + "url": "https://gitlab.nixica.dev/nix/lint-utils" + }, + "original": { + "type": "git", + "url": "https://gitlab.nixica.dev/nix/lint-utils" + } + }, + "lint-utils_11": { + "inputs": { + "flake-utils": "flake-utils_15", + "nixpkgs": "nixpkgs_20" + }, + "locked": { + "lastModified": 1699441004, + "narHash": "sha256-7v7CH8ZiB2RClPtpgDLfQxeR+14KXoFl2qTdXd27sL0=", + "ref": "refs/heads/master", + "rev": "226003d10c2d192b088f7c3c9ee7ca549c421a9c", + "revCount": 52, + "type": "git", + "url": "https://gitlab.nixica.dev/nix/lint-utils" + }, + "original": { + "type": "git", + "url": "https://gitlab.nixica.dev/nix/lint-utils" + } + }, + "lint-utils_12": { + "inputs": { + "flake-utils": "flake-utils_16", + "nixpkgs": [ + "horizon-develop-flake", + "horizon-shell", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1701713103, + "narHash": "sha256-IstHSRxNrhyYTeIWAaUjmkdtGFXQlgQQdr28le1RwGA=", + "ref": "refs/heads/master", + "rev": "4dffa421c015db30f3755bfa358b15fc9cf5c6ff", + "revCount": 56, + "type": "git", + "url": "https://gitlab.nixica.dev/nix/lint-utils" + }, + "original": { + "type": "git", + "url": "https://gitlab.nixica.dev/nix/lint-utils" + } + }, "lint-utils_2": { "inputs": { "flake-utils": "flake-utils_3", "nixpkgs": [ + "horizon-develop-flake", "flake-to-gitlab-ci", "nixpkgs" ] @@ -724,11 +1024,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1681737193, - "narHash": "sha256-c+0eLyF/VWZWGeB1DA88aDUZ3BjO6+jnsJpVW4wxs4w=", + "lastModified": 1699441004, + "narHash": "sha256-7v7CH8ZiB2RClPtpgDLfQxeR+14KXoFl2qTdXd27sL0=", "ref": "refs/heads/master", - "rev": "efaf89d12a6811f0e00034444904b8d169f0fa34", - "revCount": 48, + "rev": "226003d10c2d192b088f7c3c9ee7ca549c421a9c", + "revCount": 52, "type": "git", "url": "https://gitlab.nixica.dev/nix/lint-utils" }, @@ -740,17 +1040,14 @@ "lint-utils_4": { "inputs": { "flake-utils": "flake-utils_6", - "nixpkgs": [ - "horizon-gen-nix", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1681737193, - "narHash": "sha256-c+0eLyF/VWZWGeB1DA88aDUZ3BjO6+jnsJpVW4wxs4w=", + "lastModified": 1699441004, + "narHash": "sha256-7v7CH8ZiB2RClPtpgDLfQxeR+14KXoFl2qTdXd27sL0=", "ref": "refs/heads/master", - "rev": "efaf89d12a6811f0e00034444904b8d169f0fa34", - "revCount": 48, + "rev": "226003d10c2d192b088f7c3c9ee7ca549c421a9c", + "revCount": 52, "type": "git", "url": "https://gitlab.nixica.dev/nix/lint-utils" }, @@ -761,15 +1058,15 @@ }, "lint-utils_5": { "inputs": { - "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_9" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1681737193, - "narHash": "sha256-c+0eLyF/VWZWGeB1DA88aDUZ3BjO6+jnsJpVW4wxs4w=", + "lastModified": 1699441004, + "narHash": "sha256-7v7CH8ZiB2RClPtpgDLfQxeR+14KXoFl2qTdXd27sL0=", "ref": "refs/heads/master", - "rev": "efaf89d12a6811f0e00034444904b8d169f0fa34", - "revCount": 48, + "rev": "226003d10c2d192b088f7c3c9ee7ca549c421a9c", + "revCount": 52, "type": "git", "url": "https://gitlab.nixica.dev/nix/lint-utils" }, @@ -780,19 +1077,19 @@ }, "lint-utils_6": { "inputs": { - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_8", "nixpkgs": [ - "horizon-shell", - "crazyshell", + "horizon-develop-flake", + "horizon-gen-nix", "nixpkgs" ] }, "locked": { - "lastModified": 1681737193, - "narHash": "sha256-c+0eLyF/VWZWGeB1DA88aDUZ3BjO6+jnsJpVW4wxs4w=", + "lastModified": 1701713103, + "narHash": "sha256-IstHSRxNrhyYTeIWAaUjmkdtGFXQlgQQdr28le1RwGA=", "ref": "refs/heads/master", - "rev": "efaf89d12a6811f0e00034444904b8d169f0fa34", - "revCount": 48, + "rev": "4dffa421c015db30f3755bfa358b15fc9cf5c6ff", + "revCount": 56, "type": "git", "url": "https://gitlab.nixica.dev/nix/lint-utils" }, @@ -803,8 +1100,8 @@ }, "lint-utils_7": { "inputs": { - "flake-utils": "flake-utils_11", - "nixpkgs": "nixpkgs_12" + "flake-utils": "flake-utils_10", + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1681737193, @@ -822,9 +1119,11 @@ }, "lint-utils_8": { "inputs": { - "flake-utils": "flake-utils_12", + "flake-utils": "flake-utils_11", "nixpkgs": [ + "horizon-develop-flake", "horizon-shell", + "crazyshell", "nixpkgs" ] }, @@ -842,6 +1141,25 @@ "url": "https://gitlab.nixica.dev/nix/lint-utils" } }, + "lint-utils_9": { + "inputs": { + "flake-utils": "flake-utils_13", + "nixpkgs": "nixpkgs_16" + }, + "locked": { + "lastModified": 1699441004, + "narHash": "sha256-7v7CH8ZiB2RClPtpgDLfQxeR+14KXoFl2qTdXd27sL0=", + "ref": "refs/heads/master", + "rev": "226003d10c2d192b088f7c3c9ee7ca549c421a9c", + "revCount": 52, + "type": "git", + "url": "https://gitlab.nixica.dev/nix/lint-utils" + }, + "original": { + "type": "git", + "url": "https://gitlab.nixica.dev/nix/lint-utils" + } + }, "nixpkgs": { "locked": { "lastModified": 1701539137, @@ -876,6 +1194,24 @@ "type": "github" } }, + "nixpkgs-lib_10": { + "locked": { + "dir": "lib", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-lib_2": { "locked": { "dir": "lib", @@ -915,11 +1251,11 @@ "nixpkgs-lib_4": { "locked": { "dir": "lib", - "lastModified": 1682879489, - "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "type": "github" }, "original": { @@ -933,11 +1269,11 @@ "nixpkgs-lib_5": { "locked": { "dir": "lib", - "lastModified": 1682879489, - "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "type": "github" }, "original": { @@ -949,6 +1285,24 @@ } }, "nixpkgs-lib_6": { + "locked": { + "dir": "lib", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_7": { "locked": { "dir": "lib", "lastModified": 1682879489, @@ -966,6 +1320,42 @@ "type": "github" } }, + "nixpkgs-lib_8": { + "locked": { + "dir": "lib", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_9": { + "locked": { + "dir": "lib", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1685801374, @@ -984,27 +1374,43 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1686701582, - "narHash": "sha256-uCj6bWmhb2RF+kmCP7T5ov5pg3HjksIyv4WDsCHZQyU=", + "lastModified": 1644525281, + "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "55843b93856ad113166142cb3d2b01ffdcdf5de0", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "type": "github" }, "original": { "owner": "nixos", - "ref": "haskell-updates", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { - "lastModified": 1696757521, - "narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=", + "lastModified": 1703134684, + "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2646b294a146df2781b1ca49092450e8a32814e1", + "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523", "type": "github" }, "original": { @@ -1014,7 +1420,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -1030,7 +1436,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1686701582, "narHash": "sha256-uCj6bWmhb2RF+kmCP7T5ov5pg3HjksIyv4WDsCHZQyU=", @@ -1046,7 +1452,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { "lastModified": 1696757521, "narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=", @@ -1062,13 +1468,45 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_16": { + "locked": { + "lastModified": 1644525281, + "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_17": { "locked": { - "lastModified": 1702830618, - "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_18": { + "locked": { + "lastModified": 1644525281, + "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", + "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", "type": "github" }, "original": { @@ -1078,6 +1516,22 @@ "type": "github" } }, + "nixpkgs_19": { + "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_2": { "locked": { "lastModified": 1689261696, @@ -1094,6 +1548,70 @@ "type": "github" } }, + "nixpkgs_20": { + "locked": { + "lastModified": 1644525281, + "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_21": { + "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_22": { + "locked": { + "lastModified": 1702272962, + "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_23": { + "locked": { + "lastModified": 1703438236, + "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_3": { "locked": { "lastModified": 1644525281, @@ -1160,47 +1678,47 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1686701582, - "narHash": "sha256-uCj6bWmhb2RF+kmCP7T5ov5pg3HjksIyv4WDsCHZQyU=", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "55843b93856ad113166142cb3d2b01ffdcdf5de0", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "type": "github" }, "original": { "owner": "nixos", - "ref": "haskell-updates", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_8": { "locked": { - "lastModified": 1696757521, - "narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=", - "owner": "nixos", + "lastModified": 1644525281, + "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "2646b294a146df2781b1ca49092450e8a32814e1", + "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1644525281, - "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", - "owner": "NixOS", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1230,12 +1748,9 @@ }, "root": { "inputs": { - "feedback": "feedback", "flake-parts": "flake-parts", - "flake-to-gitlab-ci": "flake-to-gitlab-ci", - "horizon-gen-nix": "horizon-gen-nix", - "horizon-shell": "horizon-shell", - "nixpkgs": "nixpkgs_15" + "horizon-develop-flake": "horizon-develop-flake", + "nixpkgs": "nixpkgs_23" } }, "safe-coloured-text": { diff --git a/develop/flake.nix b/develop/flake.nix index 6e16f010878856191d14b30bc56c2b8ce84d9b95..9cb5ddf44bfd6d5aeb08f018912a1dc0915d9a56 100644 --- a/develop/flake.nix +++ b/develop/flake.nix @@ -6,11 +6,8 @@ }; inputs = { - feedback.url = "github:NorfairKing/feedback"; flake-parts.url = "github:hercules-ci/flake-parts"; - flake-to-gitlab-ci.url = "git+https://gitlab.nixica.dev/haskell/flake-to-gitlab-ci?ref=refs/tags/0.2.4.2"; - horizon-gen-nix.url = "git+https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix?ref=refs/tags/0.11.0"; - horizon-shell.url = "git+https://gitlab.horizon-haskell.net/shells/horizon-shell?ref=refs/tags/0.0.9"; + horizon-develop-flake.url = "git+https://gitlab.horizon-haskell.net/nix/horizon-develop-flake"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; }; @@ -28,69 +25,8 @@ "x86_64-darwin" "x86_64-linux" ]; - perSystem = { system, pkgs, ... }: - let - cachix-push-horizon-ghc-only = pkgs.writers.writeBashBin "cachix-push-horizon-ghc-only" '' - nix build -L --json .#packages.x86_64-linux.ghc | ${pkgs.jq}/bin/jq -r '.[].outputs | to_entries[].value' | ${pkgs.cachix}/bin/cachix push horizon - ''; - - cachix-push-horizon-devour = pkgs.writers.writeBashBin "cachix-push-horizon-devour" '' - nix build github:srid/devour-flake -L --no-link --print-out-paths --override-input flake . | xargs cat | ${pkgs.cachix}/bin/cachix push horizon - ''; - - devour-flake = pkgs.writers.writeBashBin "devour-flake" '' - nix build github:srid/devour-flake -L --no-link --print-out-paths --override-input flake . --keep-going - ''; - - test-template = pkgs.writers.writeBashBin "test-template" '' - mkdir temp - cd temp - nix flake init -t 'git+https://gitlab.horizon-haskell.net/templates/horizon-templates#minimal' - git init . - git add * - nix build github:srid/devour-flake -L --no-link --print-out-paths --override-input flake . --override-input flake/horizon-platform ../ --keep-going - cd .. - rm temp -rf - ''; - - run-horizon-gen-nix = pkgs.writers.writeBashBin "run-horizon-gen-nix" '' - ${pkgs.cabal-install}/bin/cabal update - ${inputs.horizon-gen-nix.packages.${system}.default}/bin/horizon-gen-nix $@; - ''; - - in - { - - apps = { - cachix-push-horizon-devour = { - type = "app"; - program = "${cachix-push-horizon-devour}/bin/cachix-push-horizon-devour"; - }; - cachix-push-horizon-ghc-only = { - type = "app"; - program = "${cachix-push-horizon-ghc-only}/bin/cachix-push-horizon-ghc-only"; - }; - devour-flake = { - type = "app"; - program = "${devour-flake}/bin/devour-flake"; - }; - feedback = { - type = "app"; - program = "${inputs.feedback.packages.${system}.default}/bin/feedback"; - }; - flake-to-gitlab-ci = inputs.flake-to-gitlab-ci.apps.${system}.default; - horizon-gen-nix = inputs.horizon-gen-nix.apps.${system}.default; - horizon-shell = inputs.horizon-shell.apps.${system}.default; - run-horizon-gen-nix = { - program = "${run-horizon-gen-nix}/bin/run-horizon-gen-nix"; - type = "app"; - }; - test-template = { - type = "app"; - program = "${test-template}/bin/test-template"; - }; - }; - - }; + imports = [ + inputs.horizon-develop-flake.flakeModule + ]; }; }