From fc4c35131ab371a3031b9e9db8fd462763649666 Mon Sep 17 00:00:00 2001
From: Daniel Firth <dan.firth@homotopic.tech>
Date: Sun, 19 Mar 2023 21:32:00 +0000
Subject: [PATCH] flake.nix: remove all cruft
---
flake.lock | 238 ++---------------------------------------------------
flake.nix | 38 +--------
2 files changed, 8 insertions(+), 268 deletions(-)
diff --git a/flake.lock b/flake.lock
index 622d6f57..13c56d7d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,42 +1,5 @@
{
"nodes": {
- "devenv": {
- "inputs": {
- "flake-compat": "flake-compat",
- "nix": "nix",
- "nixpkgs": "nixpkgs",
- "pre-commit-hooks": "pre-commit-hooks"
- },
- "locked": {
- "lastModified": 1678720350,
- "narHash": "sha256-2WUISGDqlshoLgLh2BCqWn0jAcHOnROYtEpgemmxXaQ=",
- "owner": "cachix",
- "repo": "devenv",
- "rev": "b97ca4bd581f0e2fb620f301cc417791f655f851",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "devenv",
- "type": "github"
- }
- },
- "flake-compat": {
- "flake": false,
- "locked": {
- "lastModified": 1673956053,
- "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
@@ -56,21 +19,6 @@
}
},
"flake-utils": {
- "locked": {
- "lastModified": 1667395993,
- "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "flake-utils_2": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@@ -85,63 +33,10 @@
"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"
- }
- },
- "gitignore": {
- "inputs": {
- "nixpkgs": [
- "devenv",
- "pre-commit-hooks",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1660459072,
- "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "type": "github"
- }
- },
- "horizon-platform": {
- "flake": false,
- "locked": {
- "lastModified": 1678886634,
- "narHash": "sha256-PkiDQImBu4i9sOKiOIEDMryBGn3ouBZ/H0+mAyOEbLk=",
- "ref": "refs/heads/master",
- "rev": "0b3c27cd666315edca0585e82ed6d74f208fff5b",
- "revCount": 997,
- "type": "git",
- "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-platform"
- },
- "original": {
- "type": "git",
- "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-platform"
- }
- },
"lint-utils": {
"inputs": {
- "flake-utils": "flake-utils_2",
- "nixpkgs": "nixpkgs_2"
+ "flake-utils": "flake-utils",
+ "nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1670623736,
@@ -157,58 +52,18 @@
"url": "https://gitlab.homotopic.tech/nix/lint-utils"
}
},
- "lowdown-src": {
- "flake": false,
- "locked": {
- "lastModified": 1633514407,
- "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
- "owner": "kristapsdz",
- "repo": "lowdown",
- "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
- "type": "github"
- },
- "original": {
- "owner": "kristapsdz",
- "repo": "lowdown",
- "type": "github"
- }
- },
- "nix": {
- "inputs": {
- "lowdown-src": "lowdown-src",
- "nixpkgs": [
- "devenv",
- "nixpkgs"
- ],
- "nixpkgs-regression": "nixpkgs-regression"
- },
- "locked": {
- "lastModified": 1676545802,
- "narHash": "sha256-EK4rZ+Hd5hsvXnzSzk2ikhStJnD63odF7SzsQ8CuSPU=",
- "owner": "domenkozar",
- "repo": "nix",
- "rev": "7c91803598ffbcfe4a55c44ac6d49b2cf07a527f",
- "type": "github"
- },
- "original": {
- "owner": "domenkozar",
- "ref": "relaxed-flakes",
- "repo": "nix",
- "type": "github"
- }
- },
"nixpkgs": {
"locked": {
- "lastModified": 1678500213,
- "narHash": "sha256-A5s2rXawJ+dCThkMXoMuYW8dgyUmkElcyfVJUot/Vr0=",
+ "lastModified": 1644525281,
+ "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "2ce9b9842b5e63884dfc3dea6689769e2a1ea309",
+ "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixpkgs-unstable",
+ "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@@ -231,55 +86,7 @@
"type": "github"
}
},
- "nixpkgs-regression": {
- "locked": {
- "lastModified": 1643052045,
- "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
- "type": "github"
- }
- },
- "nixpkgs-stable": {
- "locked": {
- "lastModified": 1673800717,
- "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-22.11",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs_2": {
- "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_3": {
"locked": {
"lastModified": 1673947312,
"narHash": "sha256-xx/2nRwRy3bXrtry6TtydKpJpqHahjuDB5sFkQ/XNDE=",
@@ -295,42 +102,11 @@
"type": "github"
}
},
- "pre-commit-hooks": {
- "inputs": {
- "flake-compat": [
- "devenv",
- "flake-compat"
- ],
- "flake-utils": "flake-utils",
- "gitignore": "gitignore",
- "nixpkgs": [
- "devenv",
- "nixpkgs"
- ],
- "nixpkgs-stable": "nixpkgs-stable"
- },
- "locked": {
- "lastModified": 1678376203,
- "narHash": "sha256-3tyYGyC8h7fBwncLZy5nCUjTJPrHbmNwp47LlNLOHSM=",
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "rev": "1a20b9708962096ec2481eeb2ddca29ed747770a",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "type": "github"
- }
- },
"root": {
"inputs": {
- "devenv": "devenv",
"flake-parts": "flake-parts",
- "get-flake": "get-flake",
- "horizon-platform": "horizon-platform",
"lint-utils": "lint-utils",
- "nixpkgs": "nixpkgs_3"
+ "nixpkgs": "nixpkgs_2"
}
}
},
diff --git a/flake.nix b/flake.nix
index 3e4c9e05..bbcda025 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,13 +8,7 @@
};
inputs = {
- devenv.url = "github:cachix/devenv";
- get-flake.url = "github:ursi/get-flake";
flake-parts.url = "github:hercules-ci/flake-parts";
- horizon-platform = {
- url = "git+https://gitlab.horizon-haskell.net/package-sets/horizon-platform";
- flake = false;
- };
lint-utils.url = "git+https://gitlab.homotopic.tech/nix/lint-utils";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
};
@@ -22,10 +16,7 @@
outputs =
inputs@
{ self
- , devenv
- , get-flake
, flake-parts
- , horizon-platform
, lint-utils
, nixpkgs
, ...
@@ -35,23 +26,6 @@
perSystem = { config, system, ... }:
let
pkgs = nixpkgs.legacyPackages.${system};
- in
- with pkgs.lib;
- with pkgs.writers;
- with lint-utils.writers.${system};
- let
-
- horizon-platform-prev = get-flake horizon-platform;
-
- horizon-gen-nix = pkgs.writeShellApplication {
- name = "horizon-gen-nix";
- runtimeInputs = with pkgs; [ ghc cabal-install ];
- text = ''
- ${horizon-platform-prev.legacyPackages.${system}.horizon-gen-nix}/bin/horizon-gen-nix;
- ${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt pkgs/*
- ${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt initial-packages.nix
- '';
- };
haskellLib = pkgs.haskell.lib.compose;
@@ -68,7 +42,7 @@
nonHackagePackages = self: super: { };
};
- packages = filterAttrs
+ packages = pkgs.lib.filterAttrs
(n: v: v != null
&& builtins.typeOf v == "set"
&& pkgs.lib.hasAttr "type" v
@@ -82,16 +56,6 @@
checks = with lint-utils.linters.${system}; {
dhall-format = dhall-format { src = self; };
nixpkgs-fmt = nixpkgs-fmt { src = self; find = "flake.nix"; };
- stylish-haskell = stylish-haskell { src = self; };
- };
-
- devShells.default = devenv.lib.mkShell {
- inherit inputs pkgs;
- modules = [
- ({ pkgs, ... }: {
- packages = [ horizon-gen-nix pkgs.nixpkgs-fmt ];
- })
- ];
};
inherit legacyPackages;
--
GitLab