update flake
This commit is contained in:
parent
a7ce6f36a1
commit
df2cfcf411
2 changed files with 22 additions and 13 deletions
|
@ -66,11 +66,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1669919723,
|
"lastModified": 1670132710,
|
||||||
"narHash": "sha256-uPunC0NFkJpflH3WtelwKdJUwLk4gmxE+Rtdop98s8M=",
|
"narHash": "sha256-IT4MnLdmgWkkXkVy4qNcA/6J53f36avJtIL0n1M/1M0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "89a353ccd2a6b5c78d5ac3789e8c9bc2109a75ec",
|
"rev": "8bc39a24bcef4d2aefebaa06b3ed75128599a262",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
29
flake.nix
29
flake.nix
|
@ -18,7 +18,7 @@
|
||||||
pkgs.haskell.lib.doJailbreak (pkg.overrideAttrs (_: { meta = { }; }));
|
pkgs.haskell.lib.doJailbreak (pkg.overrideAttrs (_: { meta = { }; }));
|
||||||
|
|
||||||
packageName = "tracer-game";
|
packageName = "tracer-game";
|
||||||
in {
|
in rec {
|
||||||
packages.${packageName} = # (ref:haskell-package-def)
|
packages.${packageName} = # (ref:haskell-package-def)
|
||||||
haskellPackages.callCabal2nix packageName self rec {
|
haskellPackages.callCabal2nix packageName self rec {
|
||||||
affection = affection-src.defaultPackage.${system};
|
affection = affection-src.defaultPackage.${system};
|
||||||
|
@ -26,21 +26,30 @@
|
||||||
|
|
||||||
defaultPackage = self.packages.${system}.${packageName};
|
defaultPackage = self.packages.${system}.${packageName};
|
||||||
|
|
||||||
devShell = pkgs.mkShell {
|
devShell = haskellPackages.shellFor {
|
||||||
|
packages = p: [ defaultPackage ];
|
||||||
|
withHoogle = true;
|
||||||
buildInputs = with haskellPackages; [
|
buildInputs = with haskellPackages; [
|
||||||
haskell-language-server
|
haskell-language-server
|
||||||
ghcid
|
ghcid
|
||||||
cabal-install
|
cabal-install
|
||||||
];
|
];
|
||||||
nativeBuildInputs = with pkgs; [
|
|
||||||
pkg-config
|
|
||||||
glib
|
|
||||||
freetype
|
|
||||||
glew
|
|
||||||
SDL2
|
|
||||||
];
|
|
||||||
inputsFrom = builtins.attrValues self.packages.${system};
|
|
||||||
};
|
};
|
||||||
|
#devShell = pkgs.mkShell {
|
||||||
|
# buildInputs = with haskellPackages; [
|
||||||
|
# haskell-language-server
|
||||||
|
# ghcid
|
||||||
|
# cabal-install
|
||||||
|
# ];
|
||||||
|
# nativeBuildInputs = with pkgs; [
|
||||||
|
# pkg-config
|
||||||
|
# glib
|
||||||
|
# freetype
|
||||||
|
# glew
|
||||||
|
# SDL2
|
||||||
|
# ];
|
||||||
|
# inputsFrom = builtins.attrValues self.packages.${system};
|
||||||
|
#};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue