From d1acd4d81d7b9ecf15f1f5441f60686aa0d86214 Mon Sep 17 00:00:00 2001
From: Daniel Firth <dan.firth@homotopic.tech>
Date: Fri, 28 Oct 2022 20:57:55 +0100
Subject: [PATCH] use horizon-gen-nix app from upstream
---
flake.lock | 206 +++--------------------------------------------------
flake.nix | 5 +-
2 files changed, 9 insertions(+), 202 deletions(-)
diff --git a/flake.lock b/flake.lock
index 4d31ffa6..95a19312 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,21 +1,5 @@
{
"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,
@@ -31,65 +15,6 @@
}
},
"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=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "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=",
@@ -120,19 +45,13 @@
}
},
"horizon-gen-nix": {
- "inputs": {
- "cabal2nix": "cabal2nix",
- "flake-utils": "flake-utils_2",
- "horizon-platform": "horizon-platform",
- "lint-utils": "lint-utils_2",
- "nixpkgs": "nixpkgs_3"
- },
+ "flake": false,
"locked": {
- "lastModified": 1666357930,
- "narHash": "sha256-J/fKWOjoafC9SzL7+F2df7PdrC4f6+gDGGuwL/Peufc=",
+ "lastModified": 1666986763,
+ "narHash": "sha256-/veAWnKs7u+e2j1kXXm3iMiKa/YOl5pacyLuV5jYOfw=",
"ref": "refs/heads/master",
- "rev": "c1586cd98d609bcd5ef6cd7661f14c070e841b3b",
- "revCount": 16,
+ "rev": "a5ed1b6ae187c8c398b8cd43d9341437ced4c03b",
+ "revCount": 21,
"type": "git",
"url": "https://gitlab.homotopic.tech/horizon/horizon-gen-nix"
},
@@ -141,29 +60,9 @@
"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",
+ "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs"
},
"locked": {
@@ -180,47 +79,6 @@
"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,
@@ -253,61 +111,13 @@
"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",
"get-flake": "get-flake",
"horizon-gen-nix": "horizon-gen-nix",
- "lint-utils": "lint-utils_3",
- "nixpkgs": "nixpkgs_5"
+ "lint-utils": "lint-utils",
+ "nixpkgs": "nixpkgs_2"
}
}
},
diff --git a/flake.nix b/flake.nix
index 9fc012ba..cd7514fc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,10 +29,7 @@
in
{
apps = {
- horizon-gen-nix = {
- type = "app";
- program = "${horizon-gen-nix-app.outputs.packages.${system}.default}/bin/horizon-gen-nix";
- };
+ horizon-gen-nix = horizon-gen-nix-app.outputs.apps.${system}.default;
horizon-gen-gitlab-ci = {
type = "app";
program = "${horizon-gen-gitlab-ci}/bin/gen-gitlab-ci";
--
GitLab