Merge default.nix into flake.nix; update dependencies

default.nix

-{ 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

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": {

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};