diff --git a/flake.lock b/flake.lock index 903817d..516826d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,46 +1,12 @@ { "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", + "lastModified": 1746183838, + "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1743576891, - "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "44a69ed688786e98a101f02b712c313f1ade37ab", + "rev": "bf3287dac860542719fe7554e21e686108716879", "type": "github" }, "original": { @@ -52,38 +18,7 @@ }, "root": { "inputs": { - "nixpkgs": "nixpkgs", - "sudoku-solver": "sudoku-solver" - } - }, - "sudoku-solver": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "path": "./src/sudoku-hs", - "type": "path" - }, - "original": { - "path": "./src/sudoku-hs", - "type": "path" - }, - "parent": [] - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 0e914f1..6afa618 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Nix flake for the activity logging script"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; # sudoku-solver.url = "path:./src/sudoku-hs"; }; outputs = @@ -47,6 +47,7 @@ { citra = pkgs.callPackage ./pkgs/citra/default.nix { branch = "nightly"; }; pano = pkgs.callPackage ./pkgs/pano/default.nix { }; + mealie = pkgs.callPackage ./pkgs/mealie/package.nix { }; vdhcoapp = pkgs.callPackage ./pkgs/vdhcoapp/default.nix { }; # sudoku-solver = inputs.sudoku-solver.packages.${system}.default; }