diff --git a/flake.lock b/flake.lock index c3d125d..5e950e4 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1664140963, - "narHash": "sha256-pFxDtOLduRFlol0Y4ShE+soRQX4kbhaCNBtDOvx7ykw=", + "lastModified": 1665870395, + "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=", "owner": "ryantm", "repo": "agenix", - "rev": "6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0", + "rev": "a630400067c6d03c9b3e0455347dc8559db14288", "type": "github" }, "original": { @@ -20,49 +20,25 @@ "type": "github" } }, - "alejandra": { - "inputs": { - "fenix": "fenix", - "flakeCompat": "flakeCompat", - "nixpkgs": [ - "dream2nix", - "nixpkgs" - ] - }, + "blank": { "locked": { - "lastModified": 1658427149, - "narHash": "sha256-ToD/1z/q5VHsLMrS2h96vjJoLho59eNRtknOUd19ey8=", - "owner": "kamadorueda", - "repo": "alejandra", - "rev": "f5a22afd2adfb249b4e68e0b33aa1f0fb73fb1be", + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", "type": "github" }, "original": { - "owner": "kamadorueda", - "repo": "alejandra", - "type": "github" - } - }, - "crane": { - "flake": false, - "locked": { - "lastModified": 1661875961, - "narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=", - "owner": "ipetkov", - "repo": "crane", - "rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", + "owner": "divnix", + "repo": "blank", "type": "github" } }, "deploy-rs": { "inputs": { "flake-compat": [ - "repin-flake-compat" + "blank" ], "nixpkgs": [ "nixpkgs" @@ -110,44 +86,45 @@ "type": "github" } }, - "devshell_2": { - "flake": false, - "locked": { - "lastModified": 1653917170, - "narHash": "sha256-FyxOnEE/V4PNEcMU62ikY4FfYPo349MOhMM97HS0XEo=", - "owner": "numtide", - "repo": "devshell", - "rev": "fc7a3e3adde9bbcab68af6d1e3c6eb738e296a92", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "dream2nix": { "inputs": { - "alejandra": "alejandra", - "crane": "crane", - "devshell": "devshell_2", + "alejandra": [ + "blank" + ], + "all-cabal-json": [ + "blank" + ], + "crane": [ + "blank" + ], + "devshell": [ + "blank" + ], "flake-utils-pre-commit": [ - "repin-flake-utils" + "blank" + ], + "gomod2nix": [ + "blank" + ], + "mach-nix": [ + "blank" ], - "gomod2nix": "gomod2nix", - "mach-nix": "mach-nix", "nixpkgs": [ "nixpkgs" ], - "poetry2nix": "poetry2nix", - "pre-commit-hooks": "pre-commit-hooks" + "poetry2nix": [ + "poetry2nix" + ], + "pre-commit-hooks": [ + "blank" + ] }, "locked": { - "lastModified": 1663716058, - "narHash": "sha256-VT/JDqI/OHr68fVcOl4dr+ob2GPAKQIIG9FATr+0b0U=", + "lastModified": 1665936754, + "narHash": "sha256-eAugmGOb0OtfZPBikOIbfZg0BV/sBui4EY1yfVFotAs=", "owner": "nix-community", "repo": "dream2nix", - "rev": "b54f6403f4e0b4696f0502fbf4ead24d874fadd4", + "rev": "fa708ced6f97b266092a54fc881b8f373290f505", "type": "github" }, "original": { @@ -156,41 +133,18 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "dream2nix", - "alejandra", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1657607339, - "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=", - "owner": "nix-community", - "repo": "fenix", - "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-parts": { "inputs": { - "nixpkgs": [ - "nixpkgs" + "nixpkgs-lib": [ + "nixpkgs-lib" ] }, "locked": { - "lastModified": 1664385320, - "narHash": "sha256-uSCHb9RUqHRjTpI8OzyaUuHckFnnxwZqlXEuo+yUpYQ=", + "lastModified": 1665512413, + "narHash": "sha256-IeuXVWD+VkmdVdC3d2i7mdEWhNSEvc2GUdui09zAGpE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "45298bd207b26e1bcd030a0bb075aa2da29f8e30", + "rev": "08ce9a42392cf8c7fdabf7c51069381ba5455dc7", "type": "github" }, "original": { @@ -214,55 +168,25 @@ "type": "github" } }, - "flakeCompat": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "gomod2nix": { - "flake": false, - "locked": { - "lastModified": 1627572165, - "narHash": "sha256-MFpwnkvQpauj799b4QTBJQFEddbD02+Ln5k92QyHOSk=", - "owner": "tweag", - "repo": "gomod2nix", - "rev": "67f22dd738d092c6ba88e420350ada0ed4992ae8", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "gomod2nix", - "type": "github" - } - }, "hercules-ci-agent": { "inputs": { "flake-parts": [ "flake-parts" ], - "nix-darwin": "nix-darwin", + "nix-darwin": [ + "blank" + ], "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { - "lastModified": 1662558281, - "narHash": "sha256-FOsw9gQo4aATPKI0y2zW0PQGu+eoMcscj8ulScadbis=", + "lastModified": 1665739697, + "narHash": "sha256-UvjnKP3kMtW/UzV8x/ltzO16cIf/wS+a4LlEpXA/GPw=", "owner": "hercules-ci", "repo": "hercules-ci-agent", - "rev": "64d13d65d757170eb733058b578276cc51d5de2d", + "rev": "b0207f60cab691961ae98c2807f2bf443ebfc2d8", "type": "github" }, "original": { @@ -307,25 +231,10 @@ "type": "github" } }, - "mach-nix": { - "flake": false, - "locked": { - "lastModified": 1634711045, - "narHash": "sha256-m5A2Ty88NChLyFhXucECj6+AuiMZPHXNbw+9Kcs7F6Y=", - "owner": "DavHau", - "repo": "mach-nix", - "rev": "4433f74a97b94b596fa6cd9b9c0402104aceef5d", - "type": "github" - }, - "original": { - "id": "mach-nix", - "type": "indirect" - } - }, "mms": { "inputs": { "flake-compat": [ - "repin-flake-compat" + "blank" ], "flake-utils": [ "repin-flake-utils" @@ -375,27 +284,6 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "hercules-ci-agent", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1657835815, - "narHash": "sha256-CnZszAYpNKydh6N7+xg+eRtWNVoAAGqc6bg+Lpgq1xc=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "54a24f042f93c79f5679f133faddedec61955cf2", - "type": "github" - }, - "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-filter": { "locked": { "lastModified": 1661201956, @@ -417,7 +305,9 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-regression": "nixpkgs-regression" + "nixpkgs-regression": [ + "blank" + ] }, "locked": { "host": "git.privatevoid.net", @@ -437,11 +327,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1664594436, - "narHash": "sha256-YHowMADGzdi7fKnGlg47qe0PIljq+11VqLarmXDuKxQ=", + "lastModified": 1665870850, + "narHash": "sha256-EkC/Kkc9cr2orI868OHnh6F8/aqS4TZy38ie+KnhfS8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9cac45850280978a21a3eb67b15a18f34cbffa2d", + "rev": "945a85cb7ee31f5f8c49432d77b610b777662d4f", "type": "github" }, "original": { @@ -451,61 +341,44 @@ "type": "github" } }, - "nixpkgs-regression": { + "nixpkgs-lib": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "dir": "lib", + "lastModified": 1665870850, + "narHash": "sha256-EkC/Kkc9cr2orI868OHnh6F8/aqS4TZy38ie+KnhfS8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "945a85cb7ee31f5f8c49432d77b610b777662d4f", "type": "github" }, "original": { + "dir": "lib", "owner": "NixOS", + "ref": "nixos-22.05-small", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" } }, "poetry2nix": { - "flake": false, - "locked": { - "lastModified": 1632969109, - "narHash": "sha256-jPDclkkiAy5m2gGLBlKgH+lQtbF7tL4XxBrbSzw+Ioc=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "aee8f04296c39d88155e05d25cfc59dfdd41cc77", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "1.21.0", - "repo": "poetry2nix", - "type": "github" - } - }, - "pre-commit-hooks": { "inputs": { "flake-utils": [ - "dream2nix", - "flake-utils-pre-commit" + "repin-flake-utils" ], "nixpkgs": [ - "dream2nix", "nixpkgs" ] }, "locked": { - "lastModified": 1646153636, - "narHash": "sha256-AlWHMzK+xJ1mG267FdT8dCq/HvLCA6jwmx2ZUy5O8tY=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "b6bc0b21e1617e2b07d8205e7fae7224036dfa4b", + "lastModified": 1665455310, + "narHash": "sha256-gEG1UiKz65SNWDU1NJmxLneo+kn7WjxrfucSk1zhU6o=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "d62ba59f1e28c382665c57203a4b9ad11fd7f449", "type": "github" }, "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", + "owner": "nix-community", + "repo": "poetry2nix", "type": "github" } }, @@ -532,22 +405,6 @@ "type": "github" } }, - "repin-flake-compat": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "repin-flake-utils": { "locked": { "lastModified": 1659877975, @@ -566,6 +423,7 @@ "root": { "inputs": { "agenix": "agenix", + "blank": "blank", "deploy-rs": "deploy-rs", "devshell": "devshell", "dream2nix": "dream2nix", @@ -577,26 +435,10 @@ "nix-filter": "nix-filter", "nix-super": "nix-super", "nixpkgs": "nixpkgs", - "repin-flake-compat": "repin-flake-compat", + "nixpkgs-lib": "nixpkgs-lib", + "poetry2nix": "poetry2nix", "repin-flake-utils": "repin-flake-utils" } - }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1657557289, - "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "caf23f29144b371035b864a1017dbc32573ad56d", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ab1cc39..1ac4c9d 100644 --- a/flake.nix +++ b/flake.nix @@ -93,17 +93,21 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05-small"; + nixpkgs-lib.url = "github:NixOS/nixpkgs/nixos-22.05-small?dir=lib"; nix-super = { url = "gitlab:max/nix-super?host=git.privatevoid.net"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs = { + nixpkgs.follows = "nixpkgs"; + nixpkgs-regression.follows = "blank"; + }; }; deploy-rs = { url = "gitlab:max/deploy-rs?host=git.privatevoid.net"; inputs = { nixpkgs.follows = "nixpkgs"; - flake-compat.follows = "repin-flake-compat"; + flake-compat.follows = "blank"; utils.follows = "repin-flake-utils"; }; }; @@ -125,8 +129,15 @@ url = "github:nix-community/dream2nix"; inputs = { nixpkgs.follows = "nixpkgs"; - #alejandra.inputs.flakeCompat.follows = "repin-flake-compat"; - flake-utils-pre-commit.follows = "repin-flake-utils"; + alejandra.follows = "blank"; + all-cabal-json.follows = "blank"; + crane.follows = "blank"; + devshell.follows = "blank"; + flake-utils-pre-commit.follows = "blank"; + gomod2nix.follows = "blank"; + mach-nix.follows = "blank"; + poetry2nix.follows = "poetry2nix"; + pre-commit-hooks.follows = "blank"; }; }; @@ -143,7 +154,7 @@ inputs = { nixpkgs.follows = "nixpkgs"; nix.follows = "nix-super"; - flake-compat.follows = "repin-flake-compat"; + flake-compat.follows = "blank"; flake-utils.follows = "repin-flake-utils"; }; }; @@ -153,6 +164,7 @@ inputs = { nixpkgs.follows = "nixpkgs"; flake-parts.follows = "flake-parts"; + nix-darwin.follows = "blank"; }; }; hercules-ci-effects = { @@ -164,15 +176,21 @@ flake-parts = { url = "github:hercules-ci/flake-parts"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs-lib.follows = "nixpkgs-lib"; }; nix-filter.url = "github:numtide/nix-filter"; - repin-flake-compat = { - url = "github:edolstra/flake-compat"; - flake = false; - }; repin-flake-utils.url = "github:numtide/flake-utils"; + + blank.url = "github:divnix/blank"; + + poetry2nix = { + url = "github:nix-community/poetry2nix"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "repin-flake-utils"; + }; + }; }; } diff --git a/packages/sources/sources.json b/packages/sources/sources.json index bcb6d49..1a6eacb 100644 --- a/packages/sources/sources.json +++ b/packages/sources/sources.json @@ -22,9 +22,9 @@ "repo": "excalidraw" }, "branch": "master", - "revision": "76cf560914b4d1ed2212fd6033aab36f114ad549", - "url": "https://github.com/excalidraw/excalidraw/archive/76cf560914b4d1ed2212fd6033aab36f114ad549.tar.gz", - "hash": "0rawdrajbwlc55k1537v2v4bfd8mjvyplvwjn3ykbcc6bycjm770" + "revision": "fdc462ec013d59536bf40e95cdec89c1ccda340d", + "url": "https://github.com/excalidraw/excalidraw/archive/fdc462ec013d59536bf40e95cdec89c1ccda340d.tar.gz", + "hash": "050v3n8i7vbicxp91mc9ivvzk260if7l6qgd9xly3bvph3812vab" }, "searxng": { "type": "Git", @@ -34,9 +34,9 @@ "repo": "searxng" }, "branch": "master", - "revision": "666cd1f6355a4ac72255637707a764235fd8c907", - "url": "https://github.com/searxng/searxng/archive/666cd1f6355a4ac72255637707a764235fd8c907.tar.gz", - "hash": "0h2f8n9w9za1hbn2k9zscycxwh1jy9frxnxbcv2canpxdl6qwal9" + "revision": "1a5b0965789d100a33fad69cf6779b23e6595ef4", + "url": "https://github.com/searxng/searxng/archive/1a5b0965789d100a33fad69cf6779b23e6595ef4.tar.gz", + "hash": "11sjh9za9pj5s1g1i2f2jsmrrw4c1p6ln72nqi6n50xxklxikfsd" }, "stevenblack-hosts": { "type": "GitRelease", @@ -47,10 +47,10 @@ }, "pre_releases": false, "version_upper_bound": null, - "version": "3.11.20", - "revision": "488f44fd942121dca8f91ead1cd25693816bab6b", - "url": "https://api.github.com/repos/StevenBlack/hosts/tarball/3.11.20", - "hash": "1lc715d851czs66s1azv5r3y8b8q4i0klb1l06cd394q0ig4239b" + "version": "3.11.23", + "revision": "ca5397fc85e64381eb79e4494eab3fe13cc90547", + "url": "https://api.github.com/repos/StevenBlack/hosts/tarball/3.11.23", + "hash": "0dsf9hknvahvz23jjqvbj0zkl0gcp3j3a50skh3bksqsk5yjgsgb" }, "tempo": { "type": "GitRelease", @@ -75,10 +75,10 @@ }, "pre_releases": false, "version_upper_bound": null, - "version": "1.18.3", - "revision": "60460442f869f2cc581690bd7c8930b3eb7777b8", - "url": "https://api.github.com/repos/louislam/uptime-kuma/tarball/1.18.3", - "hash": "1jcjpdzbaz5hhhb2gzb9pi0kzwmvp954n90qv4hp4b02h79a66gh" + "version": "1.18.5", + "revision": "2ee8378814d5cf92dceabcf2d9e4e79505001f16", + "url": "https://api.github.com/repos/louislam/uptime-kuma/tarball/1.18.5", + "hash": "1g59652436q993ngyyizrpac8g9i3n85dd7n90kvg1daqdiww4p1" } }, "version": 2