From d2647a243211143f0145db23d444f104bbf84a67 Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Mon, 12 Jul 2021 17:53:41 +0200
Subject: [PATCH] Add quasar dependency
---
flake.lock | 25 ++++++++++++++++++++++++-
flake.nix | 11 +++++++++--
quasar-network.cabal | 1 +
3 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/flake.lock b/flake.lock
index 1984b43..ebaa3e9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -13,9 +13,32 @@
"type": "indirect"
}
},
+ "quasar": {
+ "inputs": {
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "host": "git.c3pb.de",
+ "lastModified": 1626105841,
+ "narHash": "sha256-od9bq8zu30xbbPckIeLW4d1cEOI1EQllOn3qW9qLr1Y=",
+ "owner": "jens",
+ "repo": "quasar",
+ "rev": "fc85ec26151845dc9e972a7b91bd3828b0132baf",
+ "type": "gitlab"
+ },
+ "original": {
+ "host": "git.c3pb.de",
+ "owner": "jens",
+ "repo": "quasar",
+ "type": "gitlab"
+ }
+ },
"root": {
"inputs": {
- "nixpkgs": "nixpkgs"
+ "nixpkgs": "nixpkgs",
+ "quasar": "quasar"
}
}
},
diff --git a/flake.nix b/flake.nix
index 7c5be29..204b211 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,12 @@
{
- outputs = { self, nixpkgs }:
+ inputs = {
+ quasar = {
+ url = gitlab:jens/quasar?host=git.c3pb.de;
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+ };
+
+ outputs = { self, nixpkgs, quasar }:
let
lib = nixpkgs.lib;
systems = lib.platforms.unix;
@@ -7,7 +14,7 @@
in {
packages = forAllSystems (system: {
quasar-network = import ./. {
- pkgs = nixpkgs.legacyPackages.${system};
+ pkgs = import nixpkgs { inherit system; overlays = [ quasar.overlay ]; };
};
});
diff --git a/quasar-network.cabal b/quasar-network.cabal
index 465f359..ff1720f 100644
--- a/quasar-network.cabal
+++ b/quasar-network.cabal
@@ -63,6 +63,7 @@ common shared-properties
hashable,
mtl,
network,
+ quasar,
template-haskell,
unix,
unordered-containers,
--
GitLab