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

Merge branch 'cleanup' into 'master'

cleanup

See merge request horizon/horizon-platform!36
parents 193aae12 d0d3881d
No related merge requests found
......@@ -4,7 +4,7 @@ stages:
generate-flake-ci:
stage: generate
script: nix run "git+https://gitlab.homotopic.tech/haskell/flake-to-gitlab-ci?ref=refs/tags/0.2.1.0" > flake-ci.yml
script: nix run "git+https://gitlab.homotopic.tech/haskell/flake-to-gitlab-ci?ref=refs/tags/0.2.2.0" > flake-ci.yml
artifacts:
paths:
- flake-ci.yml
......
......@@ -66,11 +66,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1669815989,
"narHash": "sha256-yDE8uxa/O633VeRBlJKSY5q9JtzoBoMANvgupdI42YI=",
"lastModified": 1670623736,
"narHash": "sha256-CrA/yua5H0NfZ2tu1QZ2WpYi6pkWzyFxiwGk+KoF620=",
"ref": "refs/heads/master",
"rev": "5b97bd76dd6756dfc29a32d25a5c78c0522bac10",
"revCount": 39,
"rev": "ee76287dc9987dd01ec38d38839b788a26ee5f24",
"revCount": 45,
"type": "git",
"url": "https://gitlab.homotopic.tech/nix/lint-utils"
},
......
{
inputs = {
get-flake.url = "github:ursi/get-flake";
lint-utils.url = "git+https://gitlab.homotopic.tech/nix/lint-utils";
horizon-platform = {
url = "git+https://gitlab.homotopic.tech/horizon/horizon-platform";
flake = false;
};
lint-utils.url = "git+https://gitlab.homotopic.tech/nix/lint-utils";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
};
......@@ -56,8 +56,6 @@
&& v.meta.broken == false)
legacyPackages;
horizon-gen-gitlab-ci = writeBashBin "gen-gitlab-ci" "${pkgs.dhall-json}/bin/dhall-to-yaml --file .gitlab-ci.dhall";
run-impure-tests = writePorcelainOrDieBin {
name = "run-impure-tests";
src = ./.;
......@@ -86,11 +84,6 @@
program = "${horizon-gen-nix}/bin/horizon-gen-nix";
};
horizon-gen-gitlab-ci = {
type = "app";
program = "${horizon-gen-gitlab-ci}/bin/gen-gitlab-ci";
};
procex = {
type = "app";
program = "${procex}/bin/procex-shell";
......
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