From bcee5067ce3757a3126d240727f6f96d96b2bcee Mon Sep 17 00:00:00 2001
From: Daniel Firth <dan.firth@homotopic.tech>
Date: Fri, 28 Oct 2022 11:34:20 +0100
Subject: [PATCH] horizon-gen-nix: stop using version in horizon, reintroduces
locksplosion
---
flake.lock | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
flake.nix | 5 +-
2 files changed, 213 insertions(+), 5 deletions(-)
diff --git a/flake.lock b/flake.lock
index 9317a914..11dd4526 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
{
"nodes": {
+ "cabal2nix": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1665402713,
+ "narHash": "sha256-eUk0m/24UaYi75mg9C36WK7PVnosKbMEIafkRa6npno=",
+ "owner": "NixOS",
+ "repo": "cabal2nix",
+ "rev": "b3ae6f9240d07ba103f1eb7ab22f6055e9cdb7dc",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "repo": "cabal2nix",
+ "type": "github"
+ }
+ },
"flake-utils": {
"locked": {
"lastModified": 1659877975,
@@ -15,6 +31,35 @@
}
},
"flake-utils_2": {
+ "locked": {
+ "lastModified": 1659877975,
+ "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "flake-utils_3": {
+ "locked": {
+ "lastModified": 1659877975,
+ "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+ "type": "github"
+ },
+ "original": {
+ "id": "flake-utils",
+ "type": "indirect"
+ }
+ },
+ "flake-utils_4": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@@ -29,9 +74,81 @@
"type": "github"
}
},
- "lint-utils": {
+ "flake-utils_5": {
+ "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_6": {
+ "locked": {
+ "lastModified": 1644229661,
+ "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "horizon-gen-nix": {
"inputs": {
+ "cabal2nix": "cabal2nix",
"flake-utils": "flake-utils_2",
+ "horizon-platform": "horizon-platform",
+ "lint-utils": "lint-utils_2",
+ "nixpkgs": "nixpkgs_3"
+ },
+ "locked": {
+ "lastModified": 1666357930,
+ "narHash": "sha256-J/fKWOjoafC9SzL7+F2df7PdrC4f6+gDGGuwL/Peufc=",
+ "ref": "refs/heads/master",
+ "rev": "c1586cd98d609bcd5ef6cd7661f14c070e841b3b",
+ "revCount": 16,
+ "type": "git",
+ "url": "https://gitlab.homotopic.tech/horizon/horizon-gen-nix"
+ },
+ "original": {
+ "type": "git",
+ "url": "https://gitlab.homotopic.tech/horizon/horizon-gen-nix"
+ }
+ },
+ "horizon-platform": {
+ "inputs": {
+ "flake-utils": "flake-utils_3",
+ "lint-utils": "lint-utils",
+ "nixpkgs": "nixpkgs_2"
+ },
+ "locked": {
+ "lastModified": 1665929472,
+ "narHash": "sha256-8TtHWap72cgCF9aRop1DukLz0uQlvSTJwvnhHdFA9Fs=",
+ "ref": "refs/heads/master",
+ "rev": "195c05aef93557fac44d2c0ed61e28a36b0f5e6c",
+ "revCount": 145,
+ "type": "git",
+ "url": "https://gitlab.homotopic.tech/horizon/horizon-platform"
+ },
+ "original": {
+ "type": "git",
+ "url": "https://gitlab.homotopic.tech/horizon/horizon-platform"
+ }
+ },
+ "lint-utils": {
+ "inputs": {
+ "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs"
},
"locked": {
@@ -48,6 +165,47 @@
"url": "https://gitlab.homotopic.tech/nix/lint-utils"
}
},
+ "lint-utils_2": {
+ "inputs": {
+ "flake-utils": "flake-utils_5",
+ "nixpkgs": [
+ "horizon-gen-nix",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1655192403,
+ "narHash": "sha256-XyKDvRGDh8VXA6zN8DUTnDaTMrk0MxMKg70MaAX1A2Y=",
+ "ref": "refs/heads/master",
+ "rev": "a7ae54afdc4c05a5aabf202d5a76d02705eb6147",
+ "revCount": 28,
+ "type": "git",
+ "url": "https://gitlab.homotopic.tech/nix/lint-utils"
+ },
+ "original": {
+ "type": "git",
+ "url": "https://gitlab.homotopic.tech/nix/lint-utils"
+ }
+ },
+ "lint-utils_3": {
+ "inputs": {
+ "flake-utils": "flake-utils_6",
+ "nixpkgs": "nixpkgs_4"
+ },
+ "locked": {
+ "lastModified": 1655192403,
+ "narHash": "sha256-XyKDvRGDh8VXA6zN8DUTnDaTMrk0MxMKg70MaAX1A2Y=",
+ "ref": "refs/heads/master",
+ "rev": "a7ae54afdc4c05a5aabf202d5a76d02705eb6147",
+ "revCount": 28,
+ "type": "git",
+ "url": "https://gitlab.homotopic.tech/nix/lint-utils"
+ },
+ "original": {
+ "type": "git",
+ "url": "https://gitlab.homotopic.tech/nix/lint-utils"
+ }
+ },
"nixpkgs": {
"locked": {
"lastModified": 1644525281,
@@ -80,11 +238,60 @@
"type": "github"
}
},
+ "nixpkgs_3": {
+ "locked": {
+ "lastModified": 1665830552,
+ "narHash": "sha256-qel2bZ9TqfW8WzWCWdjuCy4bVFhhGsEeqFv/bj1ka2s=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "26b7e6ab6a864c3e7e077bcb27a49f0480b9894a",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_4": {
+ "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_5": {
+ "locked": {
+ "lastModified": 1665830552,
+ "narHash": "sha256-qel2bZ9TqfW8WzWCWdjuCy4bVFhhGsEeqFv/bj1ka2s=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "26b7e6ab6a864c3e7e077bcb27a49f0480b9894a",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"root": {
"inputs": {
"flake-utils": "flake-utils",
- "lint-utils": "lint-utils",
- "nixpkgs": "nixpkgs_2"
+ "horizon-gen-nix": "horizon-gen-nix",
+ "lint-utils": "lint-utils_3",
+ "nixpkgs": "nixpkgs_5"
}
}
},
diff --git a/flake.nix b/flake.nix
index f113f3eb..46e0d675 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,9 +1,10 @@
{
inputs = {
lint-utils.url = "git+https://gitlab.homotopic.tech/nix/lint-utils";
+ horizon-gen-nix.url = "git+https://gitlab.homotopic.tech/horizon/horizon-gen-nix";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
};
- outputs = inputs@{ self, nixpkgs, flake-utils, lint-utils, ... }:
+ outputs = inputs@{ self, nixpkgs, flake-utils, horizon-gen-nix, lint-utils, ... }:
flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
let
pkgs = import nixpkgs { inherit system; };
@@ -25,7 +26,7 @@
apps = {
horizon-gen-nix = {
type = "app";
- program = "${hp.horizon-gen-nix}/bin/horizon-gen-nix";
+ program = "${horizon-gen-nix.outputs.packages.x86_64-linux.default}/bin/horizon-gen-nix";
};
horizon-gen-gitlab-ci = {
type = "app";
--
GitLab