Skip to content
Snippets Groups Projects
Commit 7c7b9586 authored by Daniel Firth's avatar Daniel Firth
Browse files

Merge branch 'get-flake' into 'master'

use get-flake to import horizon-gen-nix

See merge request horizon/horizon-plutus!11
parents df6fce1f 75c2cf0a
Branches
No related merge requests found
...@@ -58,6 +58,37 @@ ...@@ -58,6 +58,37 @@
"type": "github" "type": "github"
} }
}, },
"get-flake": {
"locked": {
"lastModified": 1644686428,
"narHash": "sha256-zkhYsURWFrvEZLkIoBeqFBzSu+cA2u5mo6M8vq9LN7M=",
"owner": "ursi",
"repo": "get-flake",
"rev": "703f15558daa56dfae19d1858bb3046afe68831a",
"type": "github"
},
"original": {
"owner": "ursi",
"repo": "get-flake",
"type": "github"
}
},
"horizon-gen-nix": {
"flake": false,
"locked": {
"lastModified": 1666986763,
"narHash": "sha256-/veAWnKs7u+e2j1kXXm3iMiKa/YOl5pacyLuV5jYOfw=",
"ref": "refs/heads/master",
"rev": "a5ed1b6ae187c8c398b8cd43d9341437ced4c03b",
"revCount": 21,
"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": { "horizon-platform": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
...@@ -199,6 +230,8 @@ ...@@ -199,6 +230,8 @@
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"get-flake": "get-flake",
"horizon-gen-nix": "horizon-gen-nix",
"horizon-platform": "horizon-platform", "horizon-platform": "horizon-platform",
"lint-utils": "lint-utils_2", "lint-utils": "lint-utils_2",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
......
{ {
inputs = { 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.homotopic.tech/horizon/horizon-platform";
horizon-gen-nix = {
url = "git+https://gitlab.homotopic.tech/horizon/horizon-gen-nix";
flake = false;
};
lint-utils.url = "git+https://gitlab.homotopic.tech/nix/lint-utils"; lint-utils.url = "git+https://gitlab.homotopic.tech/nix/lint-utils";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-libR.url = "github:nixos/nixpkgs/602748c14b82a2e17078713686fe1df2824fa502"; nixpkgs-libR.url = "github:nixos/nixpkgs/602748c14b82a2e17078713686fe1df2824fa502";
}; };
outputs = inputs@{ self, nixpkgs, nixpkgs-libR, horizon-platform, flake-utils, lint-utils, ... }: outputs = inputs@{ self, get-flake, nixpkgs, nixpkgs-libR, horizon-gen-nix, horizon-platform, flake-utils, lint-utils, ... }:
flake-utils.lib.eachSystem [ "x86_64-linux" ] (system: flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
let let
pkgs-libR = import nixpkgs-libR { inherit system; }; pkgs-libR = import nixpkgs-libR { inherit system; };
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
horizon-gen-nix-app = get-flake horizon-gen-nix;
overrides-hp = final: prev: overrides-hp = final: prev:
(horizon-platform.overrides.${system}.ghc942 final prev (horizon-platform.overrides.${system}.ghc942 final prev
// (import ./overlay.nix { inherit inputs pkgs; } final prev)); // (import ./overlay.nix { inherit inputs pkgs; } final prev));
...@@ -29,11 +36,8 @@ ...@@ -29,11 +36,8 @@
in in
{ {
apps = { apps = {
horizon-gen-nix = { horizon-gen-nix = horizon-gen-nix-app.apps.${system}.default;
type = "app"; horizon-gen-gitlab-ci = {
program = "${horizon-platform.packages.${system}.horizon-gen-nix}/bin/horizon-gen-nix";
};
horizon-gen-gitlab-ci = {
type = "app"; type = "app";
program = "${horizon-gen-gitlab-ci}/bin/gen-gitlab-ci"; program = "${horizon-gen-gitlab-ci}/bin/gen-gitlab-ci";
}; };
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment