Skip to content
Snippets Groups Projects
Commit f3f54a1b authored by Jens Nolte's avatar Jens Nolte
Browse files

Commit latest verified nixpkgs version

parent 41d67259
No related branches found
No related tags found
No related merge requests found
......@@ -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
......@@ -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",
......
......@@ -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
];
}
);
};
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment