From d80696e9bd9f0b378ee9bbe4af4641b45153b123 Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Mon, 1 Aug 2022 09:54:59 +0200
Subject: [PATCH] Merge default.nix into flake.nix; update dependencies
---
default.nix | 8 --------
flake.lock | 18 ++++++++++--------
flake.nix | 17 +++++++++--------
3 files changed, 19 insertions(+), 24 deletions(-)
delete mode 100644 default.nix
diff --git a/default.nix b/default.nix
deleted file mode 100644
index e104e4e..0000000
--- a/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs ? import <nixpkgs> {}, haskellPackages ? pkgs.haskellPackages, args ? {} }:
-
-let
- #quasar-wayland = haskellPackages.callCabal2nix "quasar-wayland" ./. args;
- quasar-wayland = pkgs.haskell.packages.ghc922.callCabal2nix "quasar-wayland" ./. args;
-
-in
- if pkgs.lib.inNixShell then quasar-wayland.env else quasar-wayland
diff --git a/flake.lock b/flake.lock
index 3224e3b..a1d073f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,16 +2,18 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1649225869,
- "narHash": "sha256-u1zLtPmQzhT9mNXyM8Ey9pk7orDrIKdwooeGDEXm5xM=",
+ "lastModified": 1659077768,
+ "narHash": "sha256-P0XIHBVty6WIuIrk2DZNvLcYev9956y1prT4zL212H8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "b6966d911da89e5a7301aaef8b4f0a44c77e103c",
+ "rev": "2a93ea177c3d7700b934bf95adfe00c435f696b8",
"type": "github"
},
"original": {
- "id": "nixpkgs",
- "type": "indirect"
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
}
},
"quasar": {
@@ -22,11 +24,11 @@
},
"locked": {
"host": "git.c3pb.de",
- "lastModified": 1658625376,
- "narHash": "sha256-A+LbIPqKDimBOGvee/e/CWVZSxX7UI2CYUs7xJ2dMd4=",
+ "lastModified": 1659338987,
+ "narHash": "sha256-ysZhQq4A3bkXm3euWVvBlkuVtVv6srSmWN1U50rAhgE=",
"owner": "jens",
"repo": "quasar",
- "rev": "cd71ac69c35e1577438e73a5b5901572520b67b6",
+ "rev": "f80139a337b62d2e61e18b78530928b20da2dafc",
"type": "gitlab"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 13283f7..5290359 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,8 @@
url = gitlab:jens/quasar?host=git.c3pb.de;
inputs.nixpkgs.follows = "nixpkgs";
};
+
+ nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable;
};
outputs = { self, nixpkgs, quasar }:
@@ -17,15 +19,16 @@
self.overlay
quasar.overlay
]; };
- in {
- inherit (pkgs.haskellPackages) quasar-wayland;
+ in rec {
+ default = quasar-wayland;
+ quasar-wayland = pkgs.haskell.packages.ghc923.quasar-wayland;
}
);
- overlay = self: super: {
- haskell = super.haskell // {
- packageOverrides = hself: hsuper: super.haskell.packageOverrides hself hsuper // {
- quasar-wayland = import ./. { pkgs = self; haskellPackages = hself; };
+ overlay = final: prev: {
+ haskell = prev.haskell // {
+ packageOverrides = hfinal: hprev: prev.haskell.packageOverrides hfinal hprev // {
+ quasar-wayland = hfinal.callCabal2nix "quasar-wayland" ./. {};
};
};
};
@@ -34,8 +37,6 @@
quasar = quasar.overlay;
};
- defaultPackage = forAllSystems (system: self.packages.${system}.quasar-wayland);
-
devShell = forAllSystems (system:
let
pkgs = nixpkgs.legacyPackages.${system};
--
GitLab