From 8d53ef675d864ccd0e234f61848f7c97a26663b3 Mon Sep 17 00:00:00 2001 From: Jens Nolte <git@queezle.net> Date: Thu, 19 Aug 2021 01:22:28 +0200 Subject: [PATCH] Update flake --- flake.lock | 6 +++--- flake.nix | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 891a748..c5dd0da 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ }, "locked": { "host": "git.c3pb.de", - "lastModified": 1628788396, - "narHash": "sha256-5ROfsviLB9tD5PRRMY36hMO3MzF6jvKrmYlmz5eY06I=", + "lastModified": 1629328844, + "narHash": "sha256-4AiAjuSuTneWidipxxTu60xqztbum8OuTuKI9pWpUsQ=", "owner": "jens", "repo": "quasar", - "rev": "8a133f7d5e2965991c52355807facc5cee4a2b65", + "rev": "67efa0e198ac78aaaf308c2067019574548acf7c", "type": "gitlab" }, "original": { diff --git a/flake.nix b/flake.nix index 40a0655..86281d7 100644 --- a/flake.nix +++ b/flake.nix @@ -10,13 +10,15 @@ let lib = nixpkgs.lib; systems = lib.platforms.unix; - forAllSystems = f: lib.genAttrs systems (system: f system); + forAllSystems = lib.genAttrs systems; in { - packages = forAllSystems (system: { - quasar-network = import ./. { - pkgs = import nixpkgs { inherit system; overlays = [ quasar.overlay ]; }; - }; - }); + packages = forAllSystems (system: + let pkgs = import nixpkgs { inherit system; overlays = [ + self.overlay + quasar.overlay + ]; }; + in { inherit (pkgs.haskellPackages) quasar-network; } + ); overlay = self: super: { haskell = super.haskell // { -- GitLab