From b9f846547ec4e1cc1263f1606cf2c1cbe756db74 Mon Sep 17 00:00:00 2001
From: Daniel Firth <dan.firth@homotopic.tech>
Date: Fri, 30 Dec 2022 19:59:17 +0000
Subject: [PATCH] inputs: horizon-gen-nix: remove apps.horizon-gen-nix: switch
to 0.4.0
---
flake.lock | 17 -----------------
flake.nix | 14 ++++++--------
2 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/flake.lock b/flake.lock
index e7243f78..39426be1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -44,22 +44,6 @@
"type": "github"
}
},
- "horizon-gen-nix": {
- "flake": false,
- "locked": {
- "lastModified": 1670944091,
- "narHash": "sha256-WFj0uQqaEIURuZpfsb8yy/iqyzN8Lrc9BpWloL5a4R0=",
- "rev": "8eb5ffc81cd8331f340546d746a786c7b2f021a6",
- "revCount": 109,
- "type": "git",
- "url": "https://gitlab.homotopic.tech/horizon/horizon-gen-nix"
- },
- "original": {
- "rev": "8eb5ffc81cd8331f340546d746a786c7b2f021a6",
- "type": "git",
- "url": "https://gitlab.homotopic.tech/horizon/horizon-gen-nix"
- }
- },
"horizon-platform": {
"flake": false,
"locked": {
@@ -131,7 +115,6 @@
"inputs": {
"flake-utils": "flake-utils",
"get-flake": "get-flake",
- "horizon-gen-nix": "horizon-gen-nix",
"horizon-platform": "horizon-platform",
"lint-utils": "lint-utils",
"nixpkgs": "nixpkgs_2"
diff --git a/flake.nix b/flake.nix
index 1eee053a..aa2b982b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,10 +2,6 @@
inputs = {
get-flake.url = "github:ursi/get-flake";
lint-utils.url = "git+https://gitlab.homotopic.tech/nix/lint-utils";
- horizon-gen-nix = {
- url = "git+https://gitlab.homotopic.tech/horizon/horizon-gen-nix?rev=8eb5ffc81cd8331f340546d746a786c7b2f021a6";
- flake = false;
- };
horizon-platform = {
url = "git+https://gitlab.homotopic.tech/horizon/horizon-platform";
flake = false;
@@ -18,7 +14,6 @@
{ self
, get-flake
, flake-utils
- , horizon-gen-nix
, horizon-platform
, lint-utils
, nixpkgs
@@ -34,10 +29,10 @@
with lint-utils.writers.${system};
let
- horizon-gen-nix-app = get-flake horizon-gen-nix;
-
horizon-platform-prev = get-flake horizon-platform;
+ horizon-gen-nix = horizon-platform-prev.legacyPackages.${system}.horizon-gen-nix;
+
haskellLib = pkgs.haskell.lib.compose;
legacyPackages = pkgs.callPackage (nixpkgs + /pkgs/development/haskell-modules) {
@@ -84,7 +79,10 @@
apps = {
- horizon-gen-nix = horizon-gen-nix-app.outputs.apps.${system}.horizon-gen-nix;
+ horizon-gen-nix = {
+ type = "app";
+ program = "${horizon-gen-nix}/bin/horizon-gen-nix";
+ };
horizon-gen-gitlab-ci = {
type = "app";
--
GitLab