From 21e44230e6cf582269f522aa56701ac87213e39d Mon Sep 17 00:00:00 2001
From: Daniel Firth <dan.firth@homotopic.tech>
Date: Sun, 16 Oct 2022 14:01:50 +0100
Subject: [PATCH] Remove horizon-gen-nix from inputs
---
README.md | 2 +-
flake.lock | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
flake.nix | 9 +-----
3 files changed, 95 insertions(+), 9 deletions(-)
create mode 100644 flake.lock
diff --git a/README.md b/README.md
index b22e72de..6bed5a61 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Horizon is a haskell package set targetting new builds of GHC.
The package set is generated from the `manifest.dhall` using the following command:
```
-nix run .#horizon-gen-nix
+nix run git+https://gitlab.homotopic.tech/horizon/horizon-gen-nix
```
This will generate both the `pkgs` folder and the `overlay.nix`. If you want to
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 00000000..9317a914
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,93 @@
+{
+ "nodes": {
+ "flake-utils": {
+ "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_2": {
+ "locked": {
+ "lastModified": 1644229661,
+ "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "lint-utils": {
+ "inputs": {
+ "flake-utils": "flake-utils_2",
+ "nixpkgs": "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"
+ }
+ },
+ "nixpkgs": {
+ "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_2": {
+ "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"
+ }
+ }
+ },
+ "root": "root",
+ "version": 7
+}
diff --git a/flake.nix b/flake.nix
index ae0006e4..4c24f1e8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,9 +2,8 @@
inputs = {
lint-utils.url = "git+https://gitlab.homotopic.tech/nix/lint-utils";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
- horizon-gen-nix.url = "git+https://gitlab.homotopic.tech/horizon/horizon-gen-nix";
};
- outputs = inputs@{ self, nixpkgs, flake-utils, horizon-gen-nix, lint-utils, ... }:
+ outputs = inputs@{ self, nixpkgs, flake-utils, lint-utils, ... }:
flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
let
pkgs = import nixpkgs { inherit system; };
@@ -22,12 +21,6 @@
hp;
in
{
- apps = {
- horizon-gen-nix = {
- type = "app";
- program = "${horizon-gen-nix.outputs.packages.x86_64-linux.default}/bin/horizon-gen-nix";
- };
- };
checks = {
dhall-format = lint-utils.outputs.linters.x86_64-linux.dhall-format ./.;
nixpkgs-fmt = lint-utils.outputs.linters.x86_64-linux.nixpkgs-fmt ./.;
--
GitLab