diff --git a/flake.lock b/flake.lock index 1b35c05..445ebd2 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1667210711, - "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=", + "lastModified": 1678957337, + "narHash": "sha256-Gw4nVbuKRdTwPngeOZQOzH/IFowmz4LryMPDiJN/ah4=", "owner": "numtide", "repo": "devshell", - "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7", + "rev": "3e0e60ab37cd0bf7ab59888f5c32499d851edb47", "type": "github" }, "original": { @@ -36,11 +36,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { @@ -51,11 +51,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1643381941, - "narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=", + "lastModified": 1677383253, + "narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5efc8ca954272c4376ac929f4c5ffefcc20551d5", + "rev": "9952d6bc395f5841262b006fbace8dd7e143b634", "type": "github" }, "original": { @@ -67,11 +67,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1668681245, - "narHash": "sha256-IH8t+b9hCfNwEvdC55UEymn8jL457Fo/hx3N/kNTZso=", + "lastModified": 1678875422, + "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd4bfd814e96488febb38b4b4d0549c56b840c7f", + "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d1c4620..d79aea0 100755 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ pkgs = import nixpkgs { inherit system; config.allowUnfree = true; # For clion - overlays = [ devshell.overlay ]; + overlays = [ devshell.overlays.default ]; }; # bintools with multilib @@ -34,10 +34,6 @@ bintools = bintools_multi; }; - # Used to generate beep files - hhuOS_python = pkgs.python310.withPackages (p: with p; [ - requests - ]); in { # devShell = pkgs.devshell.mkShell ... devShell = pkgs.devshell.mkShell { @@ -47,26 +43,20 @@ gcc12_multi bintools_multi clang14_multi - hhuOS_python # Native buildinputs nasm cmake gnumake - gnutar # should be in stdenv - findutils - dosfstools - mtools # Generate floppy0.img etc. - grub2 - xorriso - util-linux + # gnutar # should be in stdenv + # findutils + # dosfstools + # mtools # Generate floppy0.img etc. + # grub2 + # xorriso + # util-linux - # Buildinputs qemu # Start os in virtual machine - - # Development - jetbrains.clion - bear # To generate compilation database gdb cling # To try out my bullshit implementations # doxygen # Generate docs + graphs @@ -83,16 +73,6 @@ help = "Show qemu i386 architecture information"; command = "qemu-system-i386 -cpu help"; } - { - name = "build"; - help = "Build ChUrlOS"; - command = "./build.sh"; - } - { - name = "run"; - help = "Run ChUrlOS"; - command = "./run.sh"; - } ]; }; });