diff --git a/flake.lock b/flake.lock index aa09361..de98361 100644 --- a/flake.lock +++ b/flake.lock @@ -71,14 +71,16 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1785062976, - "narHash": "sha256-3PQYC0Gm9NfAJbko6JTtFBlujtXWm7L5VZpUVJRu04c=", + "lastModified": 1790368160, + "narHash": "sha256-q6H6pTUzi1l1k0Hql9U0l7uTSPiv4o7ywQ/bhVFYIJg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ecf4a1a2d40f5cf118e7ffa255212ffba6036151", + "rev": "cd274f2c485f50cf9a0c90f36b13a923fa0e344e", "type": "github" }, "original": { @@ -104,6 +106,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixpak", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nordvpn-flake", @@ -124,7 +147,7 @@ "type": "indirect" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nur", @@ -165,7 +188,32 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": [ + "nixpak", + "flake-parts" + ], + "nixpkgs": [ + "nixpak", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1781499420, + "narHash": "sha256-vy0EiuiLRKWbXYOqdEKoy5ImlbHcdMC52x9BcC/MwQ8=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "86c7c78a840b44b1a0a5cbc7e9baa0154c0d0f3f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, + "hercules-ci-effects_2": { + "inputs": { + "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_6" }, "locked": { @@ -189,11 +237,11 @@ ] }, "locked": { - "lastModified": 1784350909, - "narHash": "sha256-ZWyzLbS1yKUTeFJLmdVuWNnHttL333/ldJbEE+KzCrM=", + "lastModified": 1790215976, + "narHash": "sha256-VkR1rMGyjU9jtw8ISFx5uqR9e+LEaOlhHwrseFkiIVk=", "owner": "nix-community", "repo": "home-manager", - "rev": "4ce190229c73d44536caa7072f6308fb2d8feeb3", + "rev": "a6631107a83ceab5872f298a2ea710859c80c4cb", "type": "github" }, "original": { @@ -223,6 +271,28 @@ "type": "github" } }, + "nixpak": { + "inputs": { + "flake-parts": "flake-parts", + "hercules-ci-effects": "hercules-ci-effects", + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1785072517, + "narHash": "sha256-eh6isB4Gt3Wry1fPqRI1qKWySjDbalvaBwToG82jcR4=", + "owner": "nixpak", + "repo": "nixpak", + "rev": "333bd8c7ca0c014e61be1933b3c131c9dfa20218", + "type": "github" + }, + "original": { + "owner": "nixpak", + "repo": "nixpak", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1771848320, @@ -239,29 +309,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1784856561, - "narHash": "sha256-J+Bx1Z6Oeoj2FgnBhRMKyUhhtDoOpTgXYaVLZpDjW4A=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "597283ad8aa0b331c788e97c4c262d58877074ef", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-26.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1784796856, - "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=", + "lastModified": 1790185690, + "narHash": "sha256-xJ+X4hBtOcAFGBOe5nAMyMUeF9foJBmIOu3NjBqBycU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2587caef70cea85dd97d7daab492899902dbf5d", + "rev": "4975466d324710c576dc11ad614684e6bd8cad8e", "type": "github" }, "original": { @@ -321,11 +375,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1784856561, - "narHash": "sha256-J+Bx1Z6Oeoj2FgnBhRMKyUhhtDoOpTgXYaVLZpDjW4A=", + "lastModified": 1790218706, + "narHash": "sha256-6e4Na3z008XpdVyOXgfasXIn1aN+z8AXFG+jXdQSyuI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "597283ad8aa0b331c788e97c4c262d58877074ef", + "rev": "c508844df6c28fa6dabc1b6af70f3ccbd65c5201", "type": "github" }, "original": { @@ -353,11 +407,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1784796856, - "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=", + "lastModified": 1790185690, + "narHash": "sha256-xJ+X4hBtOcAFGBOe5nAMyMUeF9foJBmIOu3NjBqBycU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e2587caef70cea85dd97d7daab492899902dbf5d", + "rev": "4975466d324710c576dc11ad614684e6bd8cad8e", "type": "github" }, "original": { @@ -394,7 +448,7 @@ "nordvpn-flake": { "inputs": { "flake-utils": "flake-utils", - "hercules-ci-effects": "hercules-ci-effects", + "hercules-ci-effects": "hercules-ci-effects_2", "nixpkgs": [ "nixpkgs" ], @@ -417,15 +471,15 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1785072147, - "narHash": "sha256-DSH73PfXqVWYz30Hnx1oeKQUx0w+C2cS3KpVN8BRYrw=", + "lastModified": 1790373482, + "narHash": "sha256-YjZ8nL6rZjW8WC2AA+TrFFrrpYNg1JnipHnYS8p8gXU=", "owner": "nix-community", "repo": "nur", - "rev": "a89983ca76709019703fec796f038a42172012ab", + "rev": "e36059ae679d1e362c936794b5267a4c7f75e36b", "type": "github" }, "original": { @@ -454,6 +508,7 @@ "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "nixos-wsl": "nixos-wsl", + "nixpak": "nixpak", "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable", "nordvpn-flake": "nordvpn-flake", @@ -468,11 +523,11 @@ ] }, "locked": { - "lastModified": 1786507911, - "narHash": "sha256-w5aZRLbiu7H6TqsYXVMdRKg0S4DRaJpxyqxx86AwxVk=", + "lastModified": 1790321428, + "narHash": "sha256-JQBGEZDY6up5yu0ehQeDDnjvsw7MP8d4AlaBd9RxZVI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "39db48099ad16834af7e27485a4babf9c28b3897", + "rev": "84fb3c79e477d5e7ec4eff9c24dbc5d5c99b0fd1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2b66d68..58b2806 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,7 @@ emacs-overlay = { url = "github:nix-community/emacs-overlay"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs-stable.follows = "nixpkgs"; }; rust-overlay = { url = "github:oxalica/rust-overlay"; @@ -22,11 +23,17 @@ }; apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; duralumin.url = "git+https://git.nirgendwo.xyz/janis/duralumin.git"; - nordvpn-flake.url = "github:janis-bhm/nordvpn-flake"; - nordvpn-flake.inputs.nixpkgs.follows = "nixpkgs"; + nordvpn-flake = { + url = "github:janis-bhm/nordvpn-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixpak = { + url = "github:nixpak/nixpak"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; }; - outputs = inputs @ { disko, nixpkgs, nixos-wsl, nixpkgs-unstable, home-manager, duralumin, emacs-overlay, rust-overlay, nordvpn-flake, ... }: + outputs = inputs @ { disko, nixpkgs, nixos-wsl, nixpkgs-unstable, home-manager, duralumin, emacs-overlay, rust-overlay, nordvpn-flake, nixpak, ... }: let system = "x86_64-linux"; overlay-unstable = final: prev: { @@ -65,6 +72,7 @@ pkgs = import nixpkgs { inherit system; config.allowUnfree = true; # Allow unfree packages globally + config.android_sdk.accept_license = true; # Accept Android SDK license config.permittedInsecurePackages = [ "electron-39.8.10" ];