From 6241396e993c772640c710cb0e50d4e82d50e576 Mon Sep 17 00:00:00 2001
From: Daniel Firth <dan.firth@homotopic.tech>
Date: Thu, 27 Apr 2023 22:34:25 +0000
Subject: [PATCH] horizon-platform: switch to horizon-haskell.net
---
flake.lock | 105 ++++++++++++++++++++++++++++++++---------------------
flake.nix | 2 +-
2 files changed, 65 insertions(+), 42 deletions(-)
diff --git a/flake.lock b/flake.lock
index 2150b2a..d87b661 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,20 +1,24 @@
{
"nodes": {
- "flake-utils": {
+ "flake-parts": {
+ "inputs": {
+ "nixpkgs-lib": "nixpkgs-lib"
+ },
"locked": {
- "lastModified": 1659877975,
- "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+ "lastModified": 1678379998,
+ "narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "c13d60b89adea3dc20704c045ec4d50dd964d447",
"type": "github"
},
"original": {
- "id": "flake-utils",
- "type": "indirect"
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
}
},
- "flake-utils_2": {
+ "flake-utils": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@@ -28,7 +32,7 @@
"type": "indirect"
}
},
- "flake-utils_3": {
+ "flake-utils_2": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@@ -43,7 +47,7 @@
"type": "github"
}
},
- "flake-utils_4": {
+ "flake-utils_3": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@@ -75,11 +79,11 @@
},
"get-flake_2": {
"locked": {
- "lastModified": 1644686428,
- "narHash": "sha256-zkhYsURWFrvEZLkIoBeqFBzSu+cA2u5mo6M8vq9LN7M=",
+ "lastModified": 1673819588,
+ "narHash": "sha256-gRtwKAlu4htvS6dxyZnW3n+vMS1acqnMGVHqxUdETeY=",
"owner": "ursi",
"repo": "get-flake",
- "rev": "703f15558daa56dfae19d1858bb3046afe68831a",
+ "rev": "e0917b6f564aa5acefb1484b5baf76da21746c3c",
"type": "github"
},
"original": {
@@ -90,64 +94,65 @@
},
"horizon-platform": {
"inputs": {
- "flake-utils": "flake-utils_2",
+ "flake-parts": "flake-parts",
"get-flake": "get-flake_2",
- "horizon-platform": "horizon-platform_2",
+ "horizon-shell-flake": "horizon-shell-flake",
"lint-utils": "lint-utils",
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1673447571,
- "narHash": "sha256-0Z+UH4vJXT9FfonmfZ8KuvlJxQ9iXqz/YGn5HTXDzaA=",
+ "lastModified": 1682634802,
+ "narHash": "sha256-xH70JAww4HOZFtG8XEy7GCSOXpQwuduwVHDgHfFbIuE=",
"ref": "refs/heads/master",
- "rev": "046c7305362aa0b3445539f9d78e648dd65167b7",
- "revCount": 886,
+ "rev": "0a45cc04a27f1ca6e6974c17c4d1ad33ac592f8f",
+ "revCount": 1073,
"type": "git",
- "url": "https://gitlab.homotopic.tech/horizon/horizon-platform"
+ "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-platform"
},
"original": {
"type": "git",
- "url": "https://gitlab.homotopic.tech/horizon/horizon-platform"
+ "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-platform"
}
},
- "horizon-platform_2": {
+ "horizon-shell-flake": {
"flake": false,
"locked": {
- "lastModified": 1672428555,
- "narHash": "sha256-+Aui0RtWnkWjSSbOrcg1zcnETuyD44YBj0WJ9fZsogI=",
- "ref": "refs/heads/master",
- "rev": "e187fb1aff7b3aad3cd81f11c5df6963d65b67ed",
- "revCount": 804,
+ "lastModified": 1679524452,
+ "narHash": "sha256-xzNxvLVa3o0F/z4CnBDORv2Y6PfxjlGv7b7LybIyCSg=",
+ "ref": "refs/tags/0.0.8",
+ "rev": "21b8913803cefeb287bb244c7ee335638233db7f",
+ "revCount": 21,
"type": "git",
- "url": "https://gitlab.homotopic.tech/horizon/horizon-platform"
+ "url": "https://gitlab.horizon-haskell.net/shells/horizon-shell"
},
"original": {
+ "ref": "refs/tags/0.0.8",
"type": "git",
- "url": "https://gitlab.homotopic.tech/horizon/horizon-platform"
+ "url": "https://gitlab.horizon-haskell.net/shells/horizon-shell"
}
},
"lint-utils": {
"inputs": {
- "flake-utils": "flake-utils_3",
+ "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1670623736,
- "narHash": "sha256-CrA/yua5H0NfZ2tu1QZ2WpYi6pkWzyFxiwGk+KoF620=",
+ "lastModified": 1681737193,
+ "narHash": "sha256-c+0eLyF/VWZWGeB1DA88aDUZ3BjO6+jnsJpVW4wxs4w=",
"ref": "refs/heads/master",
- "rev": "ee76287dc9987dd01ec38d38839b788a26ee5f24",
- "revCount": 45,
+ "rev": "efaf89d12a6811f0e00034444904b8d169f0fa34",
+ "revCount": 48,
"type": "git",
- "url": "https://gitlab.homotopic.tech/nix/lint-utils"
+ "url": "https://gitlab.nixica.dev/nix/lint-utils"
},
"original": {
"type": "git",
- "url": "https://gitlab.homotopic.tech/nix/lint-utils"
+ "url": "https://gitlab.nixica.dev/nix/lint-utils"
}
},
"lint-utils_2": {
"inputs": {
- "flake-utils": "flake-utils_4",
+ "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_3"
},
"locked": {
@@ -180,13 +185,31 @@
"type": "github"
}
},
+ "nixpkgs-lib": {
+ "locked": {
+ "dir": "lib",
+ "lastModified": 1678375444,
+ "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e",
+ "type": "github"
+ },
+ "original": {
+ "dir": "lib",
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"nixpkgs_2": {
"locked": {
- "lastModified": 1672397839,
- "narHash": "sha256-o+TBFFNSdOu5L1CUetXGMSinghqqlWcI2Sj9GVoJmUY=",
+ "lastModified": 1679198465,
+ "narHash": "sha256-VfXpHpniNWgg7pBzxb20pRX7kqn80LApPDQYTReiFCw=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "a3f612564c15e8471dd17c15efaf7ede83c57763",
+ "rev": "5a05160f7671434e1c833b1b01284b876e04eca4",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index cbcb527..fb8e7aa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,7 +8,7 @@
inputs = {
get-flake.url = "github:ursi/get-flake";
- horizon-platform.url = "git+https://gitlab.homotopic.tech/horizon/horizon-platform";
+ horizon-platform.url = "git+https://gitlab.horizon-haskell.net/package-sets/horizon-platform";
lint-utils.url = "git+https://gitlab.homotopic.tech/nix/lint-utils";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
};
--
GitLab