From 929bc70df1514fbb9787e3b6b2a9df30d83f7964 Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Tue, 5 Jul 2022 18:59:35 -0400 Subject: [PATCH] Update RFD --- flake.lock | 18 +++++++++--------- modules/overlays/rfd/default.nix | 4 ++-- packages/common.nix | 15 +++++++-------- packages/linux.nix | 3 +++ 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 1ed5df8..eea92d5 100644 --- a/flake.lock +++ b/flake.lock @@ -82,11 +82,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1656904399, - "narHash": "sha256-lJRk5fLa5xPARKIhslP9J6dLuhjV+4HmCfa+tr2HqvA=", + "lastModified": 1657006790, + "narHash": "sha256-/OAsHWvRJNe591udM69w1KhXm41WYNh25v83UBNWMHY=", "owner": "neovim", "repo": "neovim", - "rev": "f075feee3258d15f6549e33c185f6165f9c7fbfc", + "rev": "eb814bdca0bad2a68e111d59fae62f79b8dbeef1", "type": "github" }, "original": { @@ -103,11 +103,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1656922590, - "narHash": "sha256-m8SRuH6NgQ8AB7W+Oev/ip7O56YzGHHV7DMjw+bT+aM=", + "lastModified": 1657008970, + "narHash": "sha256-c6HhbjGtsZfuD0IHg6Qv8NMajNPV3Tehrw9FU8F3s90=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "61ce522387dc8219b1efe4315fb65ddbadae2b60", + "rev": "4f3fe701f50810929c06cb5cf428a4780b0d37d0", "type": "github" }, "original": { @@ -150,11 +150,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1656753965, - "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", + "lastModified": 1656835607, + "narHash": "sha256-zONMAG6JSfGyW20AsVWGnlZwNWws6Q/7IT0oDNGc1xY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb", + "rev": "18b14a254dca6b68ca0ce2ce885ce2b550065799", "type": "github" }, "original": { diff --git a/modules/overlays/rfd/default.nix b/modules/overlays/rfd/default.nix index 06e3f3b..4468451 100644 --- a/modules/overlays/rfd/default.nix +++ b/modules/overlays/rfd/default.nix @@ -8,14 +8,14 @@ in with py.pkgs; buildPythonApplication rec { pname = "rfd"; - version = "v0.8.1"; + version = "v0.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "davegallant"; repo = "rfd"; rev = version; - hash = "sha256-9gOxrKVEqbg2vLO5opoetVSxgwpm/3SV60mK8Le6F48="; + hash = "sha256-9dOxrKVEqbg2vLO5opoetVSxgwpm/3SV60mK8Le6F48="; }; # No tests included diff --git a/packages/common.nix b/packages/common.nix index 8260b37..3d8e24f 100644 --- a/packages/common.nix +++ b/packages/common.nix @@ -56,8 +56,6 @@ in { tmux-sessionizer # containers - docker - docker-compose kubectl kubernetes-helm kustomize @@ -132,17 +130,19 @@ in { /* awscli2 */ - /* - ssm-session-manager-plugin - */ + ssm-session-manager-plugin google-cloud-sdk # python python310 - python310Packages.black + /* + python310Packages.black + */ python310Packages.ipython python310Packages.pip - python310Packages.poetry + /* + python310Packages.poetry + */ python310Packages.setuptools python310Packages.virtualenv @@ -150,7 +150,6 @@ in { hugo # news - rfd srv ]; in diff --git a/packages/linux.nix b/packages/linux.nix index d2bb4cd..18e45c4 100644 --- a/packages/linux.nix +++ b/packages/linux.nix @@ -10,6 +10,9 @@ in { environment.systemPackages = with pkgs; let linux = [ cryptsetup + docker + docker-compose + rfd glibcLocales iotop linuxPackages.perf