diff --git a/flake.lock b/flake.lock index 23eb27c..1bbcba2 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "affection-local": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1, + "narHash": "sha256-jml+z0oNeFXjYreNdEMVmYPuFlDmxuYyXBZQ573Tido=", + "path": "./extern/affection", + "type": "path" + }, + "original": { + "path": "./extern/affection", + "type": "path" + } + }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -15,13 +31,43 @@ "type": "github" } }, + "flake-utils_2": { + "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" + } + }, "nixpkgs": { "locked": { - "lastModified": 1671898772, - "narHash": "sha256-NV3I//eqjpEbQTMHFAiAK03iyM9tjMIxGgu6U4qIuYk=", + "lastModified": 1669901374, + "narHash": "sha256-lObvfluyiZ9cgCMgKSrUOjzbx9Oap9949jlnNRPPYqg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7bfb51f9cdd223f208566fd06804145d0c0c4a56", + "rev": "1c5443f6cdce419174f198141bd76a3fd9502950", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1671901901, + "narHash": "sha256-dTeqgnX1HfTeQ3+VtCXB3/t/ilE5iWmjYucwgSvpwnQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b1a9ae8dfd85d144ff1b268d6c7b47934358c9a1", "type": "github" }, "original": { @@ -32,8 +78,9 @@ }, "root": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "affection-local": "affection-local", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" } } }, diff --git a/flake.nix b/flake.nix index 29d3ad4..8489e68 100644 --- a/flake.nix +++ b/flake.nix @@ -4,10 +4,10 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs"; flake-utils.url = "github:numtide/flake-utils"; - affection.url = "path:./extern/affection"; + affection-local.url = "path:./extern/affection"; }; - outputs = { self, nixpkgs, flake-utils }: + outputs = { self, nixpkgs, flake-utils, affection-local }: flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; @@ -22,6 +22,7 @@ packages.${packageName} = # (ref:haskell-package-def) haskellPackages.callCabal2nix packageName self rec { # Dependency overrides go here + affection = affection-local.defaultPackage.${system}; }; defaultPackage = self.packages.${system}.${packageName};