From 4464525b0362ecb7d3e9e9f0a33f1132b267f8f0 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Fri, 6 Sep 2024 19:51:22 +0800 Subject: [PATCH] flake: bump --- flake.lock | 81 +++++++++++++++++-------------------- flake.nix | 4 +- hosts/dust/anti-feature.nix | 1 + hosts/pek0/anti-feature.nix | 1 + hosts/tyo0/anti-feature.nix | 3 +- 5 files changed, 43 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index 51c1110..72cbfef 100644 --- a/flake.lock +++ b/flake.lock @@ -30,17 +30,12 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, "locked": { - "lastModified": 1724537630, - "narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=", + "lastModified": 1725409566, + "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", "owner": "ipetkov", "repo": "crane", - "rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0", + "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", "type": "github" }, "original": { @@ -56,11 +51,11 @@ ] }, "locked": { - "lastModified": 1724895876, - "narHash": "sha256-GSqAwa00+vRuHbq9O/yRv7Ov7W/pcMLis3HmeHv8a+Q=", + "lastModified": 1725377834, + "narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=", "owner": "nix-community", "repo": "disko", - "rev": "511388d837178979de66d14ca4a2ebd5f7991cd3", + "rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe", "type": "github" }, "original": { @@ -91,11 +86,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "type": "github" }, "original": { @@ -151,11 +146,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1725180166, + "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", "type": "github" }, "original": { @@ -201,11 +196,11 @@ ] }, "locked": { - "lastModified": 1722329086, - "narHash": "sha256-e/fSi0WER06N8WCvpht62fkGtWfe5ckDxr6zNYkwkFw=", + "lastModified": 1725379389, + "narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f5a3a7dff44d131807fc1a89fbd8576cd870334a", + "rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871", "type": "github" }, "original": { @@ -230,11 +225,11 @@ ] }, "locked": { - "lastModified": 1724599287, - "narHash": "sha256-M4OllWFNDcvgY2rgx/9uWn9jpunSb2CzmqPDcuS27SQ=", + "lastModified": 1725050929, + "narHash": "sha256-1z8i5qQwb28YM4cg1ji6b8f/5XDO30FIr/vObDRZbes=", "ref": "refs/heads/master", - "rev": "a2f4145923cbbabb63e7749a49c86052a17389f7", - "revCount": 72, + "rev": "d3b42cf643d03d675d19ec6259bb33538eaa706e", + "revCount": 73, "type": "git", "url": "https://git.ny4.dev/nyancat/nvim" }, @@ -245,11 +240,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724878143, - "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=", + "lastModified": 1725477728, + "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef", + "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", "type": "github" }, "original": { @@ -260,17 +255,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725013374, - "narHash": "sha256-fbz8MUVDWHchQSA4uguP9YYDXnX4bEdlP7YvsMcXZu4=", + "lastModified": 1725534445, + "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c169763c3087b02a8308e2f8a9bba77c428dcca1", + "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", - "rev": "c169763c3087b02a8308e2f8a9bba77c428dcca1", "type": "github" } }, @@ -290,11 +285,11 @@ ] }, "locked": { - "lastModified": 1724857454, - "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", + "lastModified": 1725513492, + "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", + "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", "type": "github" }, "original": { @@ -332,11 +327,11 @@ ] }, "locked": { - "lastModified": 1724898214, - "narHash": "sha256-4yMO9+Lsr3zqTf4clAGGag/bfNTmc/ITOXbJQcOEok4=", + "lastModified": 1725589472, + "narHash": "sha256-+OB00N6Yql/ZRQQkQ0PNnxfW2tH89DHnv29hBS7tXMM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0bc2c784e3a6ce30a2ab1b9f47325ccbed13039f", + "rev": "2b00881d2ff72174cffdc007238cb6bedd6e1d8e", "type": "github" }, "original": { @@ -355,11 +350,11 @@ ] }, "locked": { - "lastModified": 1723501126, - "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=", + "lastModified": 1725540166, + "narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=", "owner": "Mic92", "repo": "sops-nix", - "rev": "be0eec2d27563590194a9206f551a6f73d52fa34", + "rev": "d9d781523a1463965cd1e1333a306e70d9feff07", "type": "github" }, "original": { @@ -390,11 +385,11 @@ ] }, "locked": { - "lastModified": 1724833132, - "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", + "lastModified": 1725271838, + "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", + "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 15c4441..c7d9269 100644 --- a/flake.nix +++ b/flake.nix @@ -7,8 +7,7 @@ # `nixpkgs-unstable` contains less(?) jobs, and usually updates faster. # # REFERENCE: https://discourse.nixos.org/t/differences-between-nix-channels/13998/5 - nixpkgs.url = "github:NixOS/nixpkgs/c169763c3087b02a8308e2f8a9bba77c428dcca1"; # userborn - # nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; colmena = { url = "github:zhaofengli/colmena"; @@ -67,7 +66,6 @@ ### De-dupe flake dependencies crane = { url = "github:ipetkov/crane"; - inputs.nixpkgs.follows = "nixpkgs"; }; flake-compat = { url = "github:edolstra/flake-compat"; diff --git a/hosts/dust/anti-feature.nix b/hosts/dust/anti-feature.nix index bad5c98..52744d5 100644 --- a/hosts/dust/anti-feature.nix +++ b/hosts/dust/anti-feature.nix @@ -10,6 +10,7 @@ "cargo-bootstrap" "cef-binary" "dart" + "go" "rustc-bootstrap" "rustc-bootstrap-wrapper" "sof-firmware" diff --git a/hosts/pek0/anti-feature.nix b/hosts/pek0/anti-feature.nix index ae8def1..9722d37 100644 --- a/hosts/pek0/anti-feature.nix +++ b/hosts/pek0/anti-feature.nix @@ -7,6 +7,7 @@ lib.elem (lib.getName pkg) [ "adoptopenjdk-hotspot-bin" "cargo-bootstrap" + "go" "minecraft-server" "rustc-bootstrap" "rustc-bootstrap-wrapper" diff --git a/hosts/tyo0/anti-feature.nix b/hosts/tyo0/anti-feature.nix index c99caed..2a7fe21 100644 --- a/hosts/tyo0/anti-feature.nix +++ b/hosts/tyo0/anti-feature.nix @@ -7,9 +7,10 @@ lib.elem (lib.getName pkg) [ "adoptopenjdk-hotspot-bin" "cargo-bootstrap" + "go" + "keycloak" "rustc-bootstrap" "rustc-bootstrap-wrapper" - "keycloak" "temurin-bin" ];