diff --git a/flake-compat.nix b/flake-compat.nix deleted file mode 100644 index dab420bb..00000000 --- a/flake-compat.nix +++ /dev/null @@ -1,9 +0,0 @@ -let - lock = builtins.fromJSON (builtins.readFile ./flake.lock); - inherit (lock.nodes.flake-compat.locked) owner repo rev narHash; - flake-compat = builtins.fetchTarball { - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; - sha256 = narHash; - }; -in -import flake-compat { src = ./.; } diff --git a/flake.lock b/flake.lock index ee618311..6248e100 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1647893727, @@ -34,7 +18,6 @@ }, "root": { "inputs": { - "flake-compat": "flake-compat", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 89f8eca5..266cef74 100644 --- a/flake.nix +++ b/flake.nix @@ -2,23 +2,18 @@ description = "Building codium for rescript development"; inputs = { - flake-compat = { - url = "github:edolstra/flake-compat"; - flake = false; - }; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; }; outputs = { self , nixpkgs - , flake-compat }: let # Generate a user-friendly version number. version = builtins.substring 0 8 self.lastModifiedDate; # System types to support. - supportedSystems = [ "x86_64-linux" "aarch64-linux" ]; + supportedSystems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'. forAllSystems = nixpkgs.lib.genAttrs supportedSystems; # Nixpkgs instantiated for supported system types.