From 4c6e2e6a566ad4c8391ab6a75cc6216aeb3e3318 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Thu, 13 Jun 2024 14:23:36 -0400 Subject: [PATCH] Update nixpkgs, etc. Remove just override, as it is upstreamed: https://github.com/NixOS/nixpkgs/pull/316156 Remove ncdu, as it is broken: https://github.com/NixOS/nixpkgs/issues/299680 --- flake.lock | 88 ++++++++++++++++++-------------------------- home/terminal.nix | 3 +- packages/overlay.nix | 21 ----------- 3 files changed, 38 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index a2a94f6..2f79b89 100644 --- a/flake.lock +++ b/flake.lock @@ -140,11 +140,11 @@ ] }, "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "owner": "numtide", "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "type": "github" }, "original": { @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -294,21 +294,6 @@ "type": "github" } }, - "flake-root": { - "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", - "owner": "srid", - "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -413,11 +398,11 @@ ] }, "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -477,11 +462,11 @@ ] }, "locked": { - "lastModified": 1717052710, - "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=", + "lastModified": 1718243258, + "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", "owner": "nix-community", "repo": "home-manager", - "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae", + "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", "type": "github" }, "original": { @@ -498,11 +483,11 @@ ] }, "locked": { - "lastModified": 1717052710, - "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=", + "lastModified": 1718141734, + "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=", "owner": "nix-community", "repo": "home-manager", - "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae", + "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad", "type": "github" }, "original": { @@ -533,11 +518,11 @@ ] }, "locked": { - "lastModified": 1716993688, - "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", + "lastModified": 1718273659, + "narHash": "sha256-8iuM/JEhAeYZL1xMEALWFmFrJgXdShmqGfcWf7Irfo8=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", + "rev": "139ea5dd92c2065b4fa8c019d649fe04037b7c38", "type": "github" }, "original": { @@ -554,11 +539,11 @@ ] }, "locked": { - "lastModified": 1716993688, - "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", + "lastModified": 1717976995, + "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", + "rev": "315aa649ba307704db0b16c92f097a08a65ec955", "type": "github" }, "original": { @@ -574,11 +559,11 @@ ] }, "locked": { - "lastModified": 1716772633, - "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=", + "lastModified": 1718011381, + "narHash": "sha256-sFXI+ZANp/OC+MwfJoZgPSf4xMdtzQMe1pS3FGti4C8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac", + "rev": "88ad3d7501e22b2401dd72734b032b7baa794434", "type": "github" }, "original": { @@ -616,11 +601,11 @@ }, "nixos-flake": { "locked": { - "lastModified": 1718165126, - "narHash": "sha256-M+aW1O01dv6b+MKsGKVLO6dcHqTrGpeToCoz9Ced29o=", + "lastModified": 1718217024, + "narHash": "sha256-kZ+f/mZ//sQMaH3dKENXaOjDCptq+3qYkhkToagYAt8=", "owner": "srid", "repo": "nixos-flake", - "rev": "02c0ad4030ea97f3e8c470825d9844b0f0eb1f7b", + "rev": "6300eda89f674846b7084e57ebb10d8396ba9692", "type": "github" }, "original": { @@ -801,11 +786,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "type": "github" }, "original": { @@ -836,7 +821,6 @@ "devshell": "devshell", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_4", - "flake-root": "flake-root", "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin_2", @@ -846,11 +830,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1717081007, - "narHash": "sha256-GNr1i6itjFKGXSco3lcdKe8GxEwrmSYFDUpZyXsXWp4=", + "lastModified": 1718290136, + "narHash": "sha256-BQFspZqwA56LOIQ0ypw54Nal/BLFUpnZTqoXxeiSTNE=", "owner": "nix-community", "repo": "nixvim", - "rev": "da9bd1f2e8fc8cd8553a76a9e22afd386c18f205", + "rev": "80c03843e7ad7fc7deb0dce6d1f6fc45593ed91d", "type": "github" }, "original": { @@ -1172,11 +1156,11 @@ ] }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1718139168, + "narHash": "sha256-1TZQcdETNdJMcfwwoshVeCjwWfrPtkSQ8y8wFX3it7k=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "1cb529bffa880746a1d0ec4e0f5076876af931f1", "type": "github" }, "original": { diff --git a/home/terminal.nix b/home/terminal.nix index ef9b9a4..75cd109 100644 --- a/home/terminal.nix +++ b/home/terminal.nix @@ -7,8 +7,9 @@ ripgrep fd sd - ncdu moreutils # ts, etc. + # Broken, https://github.com/NixOS/nixpkgs/issues/299680 + # ncdu # Useful for Nix development nixci diff --git a/packages/overlay.nix b/packages/overlay.nix index 53fa3d9..3b2971f 100644 --- a/packages/overlay.nix +++ b/packages/overlay.nix @@ -7,25 +7,4 @@ self: super: { nixci = flake.inputs.nixci.packages.${system}.default; # nix-health = flake.inputs.nix-browser.packages.${system}.nix-health; actualism-app = flake.inputs.actualism-app.packages.${system}.default; - - # Use just v1.27.0, until upstream upgrades it. - just = super.just.overrideAttrs (oa: rec { - name = "${oa.pname}-${version}"; - version = "1.27.0"; - src = super.fetchFromGitHub { - owner = "casey"; - repo = oa.pname; - rev = "refs/tags/${version}"; - hash = "sha256-xyiIAw8PGMgYPtnnzSExcOgwG64HqC9TbBMTKQVG97k="; - }; - # Overriding `cargoHash` has no effect; we must override the resultant - # `cargoDeps` and set the hash in its `outputHash` attribute. - cargoDeps = oa.cargoDeps.overrideAttrs (super.lib.const { - name = "${name}-vendor.tar.gz"; - inherit src; - outputHash = "sha256-jMurOCr9On+sudgCzIBrPHF+6jCE/6dj5E106cAL2qw="; - }); - - doCheck = false; - }); }