christoph/churlos
1
Fork 0
Code Activity

Env: Update Flake

Browse Source
This commit is contained in:
Christoph Urlacher
2023-03-18 12:02:07 +01:00
parent 2226e76ebf
commit d89a24f6e3
2 changed files with 20 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
flake.lock generated
View File

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1667210711, "lastModified": 1678957337,
"narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=", "narHash": "sha256-Gw4nVbuKRdTwPngeOZQOzH/IFowmz4LryMPDiJN/ah4=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7", "rev": "3e0e60ab37cd0bf7ab59888f5c32499d851edb47",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,11 +36,11 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1678901627,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -51,11 +51,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1643381941, "lastModified": 1677383253,
"narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=", "narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5efc8ca954272c4376ac929f4c5ffefcc20551d5", "rev": "9952d6bc395f5841262b006fbace8dd7e143b634",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -67,11 +67,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1668681245, "lastModified": 1678875422,
"narHash": "sha256-IH8t+b9hCfNwEvdC55UEymn8jL457Fo/hx3N/kNTZso=", "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bd4bfd814e96488febb38b4b4d0549c56b840c7f", "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459",
"type": "github" "type": "github"
}, },
"original": { "original": {

36
flake.nix
View File

@ -11,7 +11,7 @@
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; # For clion config.allowUnfree = true; # For clion
overlays = [ devshell.overlay ]; overlays = [ devshell.overlays.default ];
}; };
# bintools with multilib # bintools with multilib
@ -34,10 +34,6 @@
bintools = bintools_multi; bintools = bintools_multi;
}; };
# Used to generate beep files
hhuOS_python = pkgs.python310.withPackages (p: with p; [
requests
]);
in { in {
# devShell = pkgs.devshell.mkShell ... # devShell = pkgs.devshell.mkShell ...
devShell = pkgs.devshell.mkShell { devShell = pkgs.devshell.mkShell {
@ -47,26 +43,20 @@
gcc12_multi gcc12_multi
bintools_multi bintools_multi
clang14_multi clang14_multi
hhuOS_python
# Native buildinputs # Native buildinputs
nasm nasm
cmake cmake
gnumake gnumake
gnutar # should be in stdenv # gnutar # should be in stdenv
findutils # findutils
dosfstools # dosfstools
mtools # Generate floppy0.img etc. # mtools # Generate floppy0.img etc.
grub2 # grub2
xorriso # xorriso
util-linux # util-linux
# Buildinputs
qemu # Start os in virtual machine qemu # Start os in virtual machine
# Development
jetbrains.clion
bear # To generate compilation database
gdb gdb
cling # To try out my bullshit implementations cling # To try out my bullshit implementations
# doxygen # Generate docs + graphs # doxygen # Generate docs + graphs
@ -83,16 +73,6 @@
help = "Show qemu i386 architecture information"; help = "Show qemu i386 architecture information";
command = "qemu-system-i386 -cpu help"; command = "qemu-system-i386 -cpu help";
} }
{
name = "build";
help = "Build ChUrlOS";
command = "./build.sh";
}
{
name = "run";
help = "Run ChUrlOS";
command = "./run.sh";
}
]; ];
}; };
}); });