From f3f54a1bfd0c864f0b00d14b49b7f2a89f39f560 Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Sun, 24 Jul 2022 20:29:27 +0200
Subject: [PATCH] Commit latest verified nixpkgs version
---
default.nix | 2 +-
flake.lock | 24 +++++++++++++++++-------
flake.nix | 19 +++++++++++++++++--
3 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/default.nix b/default.nix
index 82a6921..e104e4e 100644
--- a/default.nix
+++ b/default.nix
@@ -2,7 +2,7 @@
let
#quasar-wayland = haskellPackages.callCabal2nix "quasar-wayland" ./. args;
- quasar-wayland = pkgs.haskell.packages.ghc921.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 318cf41..71c6633 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1638110343,
- "narHash": "sha256-hQaow8sGPyUrXgrqgDRsfA+73uR0vms2goTQNxIAaRQ=",
+ "lastModified": 1649225869,
+ "narHash": "sha256-u1zLtPmQzhT9mNXyM8Ey9pk7orDrIKdwooeGDEXm5xM=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "942eb9a335b4cd22fa6a7be31c494e53e76f5637",
+ "rev": "b6966d911da89e5a7301aaef8b4f0a44c77e103c",
"type": "github"
},
"original": {
@@ -14,12 +14,22 @@
"type": "indirect"
}
},
+ "nixpkgs_2": {
+ "locked": {
+ "lastModified": 1640408860,
+ "narHash": "sha256-h2uF3+a8bVfM8SjcS4hLbsOzOuG3qsxuImC0BucWs1Q=",
+ "path": "/nix/store/m6p4m1rs0xi67kaa25bm1rqkm4633qjr-source",
+ "rev": "cb372c3b8880e504b06946e8fb2ca9777c685505",
+ "type": "path"
+ },
+ "original": {
+ "id": "nixpkgs",
+ "type": "indirect"
+ }
+ },
"quasar": {
"inputs": {
- "nixpkgs": [
- "quasar-network",
- "nixpkgs"
- ]
+ "nixpkgs": "nixpkgs_2"
},
"locked": {
"host": "git.c3pb.de",
diff --git a/flake.nix b/flake.nix
index 85abf16..14c6182 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,7 +18,9 @@
quasar-network.overlay
quasar-network.overlays.quasar
]; };
- in { inherit (pkgs.haskellPackages) quasar-wayland; }
+ in {
+ inherit (pkgs.haskellPackages) quasar-wayland;
+ }
);
overlay = self: super: {
@@ -36,6 +38,19 @@
defaultPackage = forAllSystems (system: self.packages.${system}.quasar-wayland);
- devShell = forAllSystems (system: self.packages.${system}.quasar-wayland.env);
+ devShell = forAllSystems (system:
+ let
+ pkgs = nixpkgs.legacyPackages.${system};
+ in pkgs.mkShell {
+ inputsFrom = [ self.packages.${system}.quasar-wayland.env ];
+ packages = [
+ pkgs.cabal-install
+ pkgs.zsh
+ pkgs.entr
+ pkgs.ghcid
+ pkgs.haskell-language-server
+ ];
+ }
+ );
};
}
--
GitLab