From e9eabae3ec01281d136a2d6be2b70fa87d7ca121 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Mon, 7 Oct 2024 16:07:53 +0800 Subject: [PATCH] flake: bump --- .editorconfig | 4 ++-- flake.lock | 30 +++++++++++++++--------------- home/default.nix | 4 +--- pkgs/mumble-git/package.nix | 4 ++-- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/.editorconfig b/.editorconfig index ac53809..4620a29 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,8 +9,8 @@ end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true -# Ignore diffs/patches -[*.{diff,patch}] +# Ignore generated files +[*.{diff,patch,tfstate}] end_of_line = unset insert_final_newline = unset trim_trailing_whitespace = unset diff --git a/flake.lock b/flake.lock index 6ae6ee8..e76524c 100644 --- a/flake.lock +++ b/flake.lock @@ -16,11 +16,11 @@ ] }, "locked": { - "lastModified": 1728180673, - "narHash": "sha256-/ewRcQl0uKFauULAxzrl9ZQ2DgKvE0iT9gJCzDsNRIQ=", + "lastModified": 1728263678, + "narHash": "sha256-gyUVsPAWY9AgVKjrNPoowrIr5BvK4gI0UkDXvv8iSxA=", "owner": "zhaofengli", "repo": "colmena", - "rev": "0fca61acc23bd95dc377758eb76885a8bce99f6a", + "rev": "b0a62f234fae02a006123e661ff70e62af16106b", "type": "github" }, "original": { @@ -225,11 +225,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728056216, - "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", + "lastModified": 1728269138, + "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", + "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", "type": "github" }, "original": { @@ -240,11 +240,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728093190, - "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", + "lastModified": 1728249353, + "narHash": "sha256-7NBJm1jfMeAowE1J2oljYqWVvI9X7FyyxBY4O8uB/Os=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", + "rev": "c8a17040be4a20b29589cb4043a9e0c36af1930e", "type": "github" }, "original": { @@ -327,11 +327,11 @@ ] }, "locked": { - "lastModified": 1728181869, - "narHash": "sha256-sQXHXsjIcGEoIHkB+RO6BZdrPfB+43V1TEpyoWRI3ww=", + "lastModified": 1728268235, + "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cd46aa3906c14790ef5cbe278d9e54f2c38f95c0", + "rev": "25685cc2c7054efc31351c172ae77b21814f2d42", "type": "github" }, "original": { @@ -350,11 +350,11 @@ ] }, "locked": { - "lastModified": 1727734513, - "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=", + "lastModified": 1728230538, + "narHash": "sha256-sbsMJOZgykaSdFbxLKghc0QMtolzl4P5nqpttBA3d5M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3198a242e547939c5e659353551b0668ec150268", + "rev": "2750ed784e93e745a33fb55be7c2657adfb57c00", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index e7c6747..a1f4767 100644 --- a/home/default.nix +++ b/home/default.nix @@ -49,9 +49,7 @@ osu-lazer-bin prismlauncher ]) - ++ (with inputs.self.legacyPackages.${pkgs.stdenv.hostPlatform.system}; [ - mumble-git - ]); + ++ (with inputs.self.legacyPackages.${pkgs.stdenv.hostPlatform.system}; [ mumble-git ]); home.sessionVariables = { # https://github.com/ppy/osu-framework/pull/6292 diff --git a/pkgs/mumble-git/package.nix b/pkgs/mumble-git/package.nix index 06b40b0..2405742 100644 --- a/pkgs/mumble-git/package.nix +++ b/pkgs/mumble-git/package.nix @@ -28,7 +28,7 @@ pulseSupport ? true, speechdSupport ? false, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "mumble"; version = "1.5.634-unstable-2024-10-05"; @@ -115,4 +115,4 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = lib.platforms.linux; }; -}) +}