Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Init nix flakes #208

Draft
wants to merge 60 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
b374fbb
Init nix flakes
haruki7049 Nov 17, 2024
c352173
Init nixGL overlay on flakes
haruki7049 Nov 20, 2024
9f4c4f6
Merge my branch, delete-pinned-nixpkgs branch
haruki7049 Nov 21, 2024
19c7a28
Merge my branch, update-i3status-submodule
Nov 21, 2024
3c58c0c
Delete localSrc and externalSrc. Use override function
haruki7049 Nov 21, 2024
75b9aba
Delete unused godot_headers submodule
haruki7049 Nov 21, 2024
56af060
Init package declaration in flake.nix
haruki7049 Nov 21, 2024
b071cff
Enable allowUnfree flag for nixpkgs
haruki7049 Nov 21, 2024
b539685
Delete checks attrset because Nix flakes cannot use Git submodules wi…
haruki7049 Nov 21, 2024
7c4d1f8
Delete self' which I wrote by my mistake
haruki7049 Nov 21, 2024
e84c8c0
Update submodules/wlroots
haruki7049 Nov 25, 2024
cc123bd
Edit Simula.nix
haruki7049 Nov 25, 2024
c6da0d1
Update godot submodule
haruki7049 Nov 25, 2024
1fc3774
Move Simula.nix to default.nix
haruki7049 Nov 26, 2024
6e1b486
Format default.nix by nixfmt-rfc-style
haruki7049 Nov 26, 2024
bd41ec1
Delete $SIMULA_NIX
haruki7049 Nov 26, 2024
4d5215c
Fix syntax error
haruki7049 Nov 26, 2024
1fa41ea
Delete unused variables in shell.nix
haruki7049 Nov 26, 2024
4d6e068
Delete "$SIMULA_APP_DIR/dialog" & "$SIMULA_APP_DIR/curl", and Add dia…
haruki7049 Nov 27, 2024
6311627
Edit utils/Helpers.sh and devShells.default
haruki7049 Nov 27, 2024
a4022f8
Display a message to install. nix-env is dirty
haruki7049 Nov 27, 2024
1a3fbf6
Edit zenRR
haruki7049 Nov 27, 2024
21673a7
Edit nsBuildWlroots
haruki7049 Nov 27, 2024
81c6acc
Edit nsBuildGodot
haruki7049 Nov 27, 2024
9f8b8d3
Edit installSimula
haruki7049 Nov 27, 2024
ca9e300
Edit updateSimula
haruki7049 Nov 27, 2024
06b5bc1
Change patchelf from './result/bin/patchelf' to 'patchelf'
haruki7049 Nov 27, 2024
c084996
Add godot-haskell-classgen to devShells.default
haruki7049 Nov 27, 2024
54b3b75
Edit nsCleanMonado and nsBuildMonado
haruki7049 Nov 27, 2024
5520898
Merge pull request #2 from haruki7049/edit-godot-haskell-plugin
haruki7049 Nov 27, 2024
0c5cb92
Add godot-haskell in devShells.default
haruki7049 Nov 28, 2024
f12c85f
Format flake.nix by nixfmt-rfc-style
haruki7049 Nov 28, 2024
d6b96f2
Add pkgs.haskellPackages.parsers in buildInputs on devShells.default
haruki7049 Nov 28, 2024
9d05cb1
Edit flake.nix
haruki7049 Nov 29, 2024
6fa9f28
Change stdenv.cc.cc to gcc
haruki7049 Nov 30, 2024
ce51361
Format flake.nix by nixfmt-rfc-style
haruki7049 Nov 30, 2024
17d3590
Delete debugging message for PKG_CONFIG_PATH
haruki7049 Nov 30, 2024
89bcd59
Delete nsBuildGodot and nsCleanGodot
haruki7049 Nov 30, 2024
6609a3d
WIP, Init apps.build-wlroots
haruki7049 Nov 30, 2024
1035d63
Separate apps.* to utils/nix directory
haruki7049 Nov 30, 2024
f5814cb
Edit build-wlroots declaration in flake.nix
haruki7049 Nov 30, 2024
61b0f7f
Edit devShells.wlroots-dev and apps.build-wlroots
haruki7049 Dec 2, 2024
53d9390
Initialize devShells.godot-dev
haruki7049 Dec 2, 2024
ad7234d
Merge pull request #3 from haruki7049/add-apps
haruki7049 Dec 2, 2024
a41852a
Initialize apps.build-monado
haruki7049 Dec 2, 2024
2d93c6c
Initialize apps.clean-monado
haruki7049 Dec 2, 2024
f1ab041
Initialize utils/installSimula.sh
haruki7049 Dec 2, 2024
9d24272
Edit utils/installSimula.sh
haruki7049 Dec 2, 2024
94afebf
Initialize /utils/checkNixVersion.sh
haruki7049 Dec 2, 2024
1a6e70e
Delete installSimula in Helpers.sh
haruki7049 Dec 2, 2024
5925428
Delete nsBuildMonado in Helpers.sh
haruki7049 Dec 2, 2024
bc35777
Delete nsCleanMonado in Helpers.sh
haruki7049 Dec 2, 2024
585618f
Initialize /utils/updateSimula.sh
haruki7049 Dec 2, 2024
40b2852
Delete updateSimula in Helpers.sh
haruki7049 Dec 2, 2024
866be05
Initialize apps.repl-godot-haskell-plugin
haruki7049 Dec 3, 2024
992c0a9
WIP, Initialize build-godot-haskell.nix
haruki7049 Dec 3, 2024
44633fa
Edit apps.build-godot-haskell
haruki7049 Dec 4, 2024
593fcc9
Delete nsBuildGodotHaskell in Helpers.sh
haruki7049 Dec 4, 2024
4cded0c
Initialize apps.build-godot-haskell-plugin
haruki7049 Dec 4, 2024
0338760
Initialize apps.patch-godot-wlroots
haruki7049 Dec 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
[submodule "godot_headers"]
path = godot_headers
url = https://github.com/GodotNativeTools/godot_headers.git
shallow = true
[submodule "submodules/wlroots"]
path = submodules/wlroots
url = https://github.com/SimulaVR/wlroots
Expand Down
368 changes: 0 additions & 368 deletions Simula.nix

This file was deleted.

7 changes: 3 additions & 4 deletions addons/godot-haskell-plugin/default.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{ devBuild ? true, onNixOS ? false, profileBuild ? false }:
{ devBuild ? true, onNixOS ? false, profileBuild ? false, pkgs }:
let
pkgs = import ../../pinned-nixpkgs.nix { };
haskellCallPkg = if profileBuild then (pkgs.haskellPackagesPIC.callPackage) else (pkgs.haskellPackages.callPackage);
godot = pkgs.callPackage ../../submodules/godot/godot.nix { devBuild = devBuild; onNixOS = onNixOS; pkgs = import ../../pinned-nixpkgs.nix; };
godot = pkgs.callPackage ../../submodules/godot/godot.nix { devBuild = devBuild; onNixOS = onNixOS; inherit pkgs; };
godot-api = "${godot}/bin/api.json";
godot-haskell = haskellCallPkg ../../submodules/godot-haskell/godot-haskell.nix { api-json = godot-api; profileBuild; };
godot-haskell = haskellCallPkg ../../submodules/godot-haskell/godot-haskell.nix { api-json = godot-api; inherit profileBuild; };

in
haskellCallPkg ./godot-haskell-plugin.nix { devBuild = devBuild; onNixOS = onNixOS; godot = godot; godot-haskell = godot-haskell; profileBuild = profileBuild; }
5 changes: 2 additions & 3 deletions addons/godot-haskell-plugin/shell.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ devBuild ? true, onNixOS ? false, profileBuild ? false }:
{ profileBuild ? false, pkgs }:
let
pkgs = if profileBuild then (import ../../pinned-nixpkgs.nix { overlays = (import ../../nix/profileOverlays.nix); }) else (import ../../pinned-nixpkgs.nix { });
haskellCallPkg = if profileBuild then (pkgs.haskellPackagesPIC.callPackage) else (pkgs.haskellPackages.callPackage);
in
pkgs.mkShell {
Expand Down Expand Up @@ -41,4 +40,4 @@ in
pkgs.haskellPackages.io-streams
pkgs.haskellPackages.zlib
];
}
}
Loading