From 82fa206a5092beb5a32665a6c47cc467972a6a5c Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Mon, 1 Sep 2025 17:51:58 +1000 Subject: [PATCH] cleanup --- flake.lock | 12 ++++++------ flake.nix | 11 ++--------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index eea39f3..aec2953 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", - "owner": "NixOS", + "lastModified": 1756687477, + "narHash": "sha256-J1By7w8yC3TZOl1Fx88jPrVWyuWXChS3jOAtgLhZ088=", + "owner": "rstats-on-nix", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "35a8d0ccfb8d8f051cb607b78423d71889688e4f", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "rstats-on-nix", + "ref": "r-daily", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 687d2a1..524dea0 100644 --- a/flake.nix +++ b/flake.nix @@ -104,7 +104,7 @@ overlays = [self.overlays.default]; }; in { - default = pkgs.rWrapper.override {packages = builtins.attrValues pkgs.extraRPackages; }; + default = pkgs.rWrapper.override {packages = builtins.attrValues pkgs.extraRPackages;}; } ); # Helpful for overlay users: expose a devShell with R including these pkgs @@ -116,14 +116,7 @@ in { default = pkgs.mkShell { packages = [ - (pkgs.rWrapper.override { - packages = with pkgs.extraRPackages; [ - nvimcom - musicMetadata - synthdid - httpgd - ]; - }) + self.packages."${system}".default ]; }; });